| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 | 296f1b0123 | add users infos to rss and atom api responses | 2011-06-21 11:41:16 +02:00 |  | 
				
					
						| 
								
								
									 fabrixxm | 976d1eaf43 | API work | 2011-04-27 17:46:23 +02:00 |  | 
				
					
						| 
								
								
									 Fabio Comuni | 41f6ccc039 | More works on api | 2011-04-21 17:03:31 +02:00 |  |