| 
								
								
									 Alexander Kampmann | 355c42cb30 | Merge branch 'master' of https://github.com/friendica/friendica Conflicts:
	include/config.php
	update.php | 2012-04-05 13:39:15 +02:00 |  | 
				
					
						| 
								
								
									 Abinoam P. Marques Jr | 6e2ae7bf1e | library/OAuth1 - Friendika -> Friendica | 2012-02-20 19:38:43 -03:00 |  | 
				
					
						| 
								
								
									 friendica | 8aa2552372 | add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) | 2012-01-18 16:21:30 -08:00 |  | 
				
					
						| 
								
								
									 Fabio Comuni | 10e5754e24 | oauth: authorize | 2011-11-07 17:36:41 +01:00 |  | 
				
					
						| 
								
								
									 Fabio Comuni | ff7fc68382 | oauthapi: authorize app | 2011-10-26 17:15:36 +02:00 |  | 
				
					
						| 
								
								
									 Friendika | 5f2f644064 | resolve file inclusion conflicts w/ multiple plugins, improve the typo checker | 2011-02-21 20:19:33 -08:00 |  |