| 
								
								
									 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 | 0c4606682f | fix link/bookmark reshares | 2012-02-11 19:21:41 -08: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 | 1ff8cddeb6 | oembed: replace base64 url for iframe with url site/oembed/url_encoded fix http://bugs.friendika.com/view.php?id=191 | 2011-11-11 17:33:32 +01:00 |  |