| 
								
								
									 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 | d9bee73edf | community meta tag renamed from "ika" | 2012-03-11 15:50:23 -07: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 |  | 
				
					
						| 
								
								
									 Friendika | 9634287839 | fix several probe related issues | 2011-08-17 23:01:44 -07:00 |  | 
				
					
						| 
								
								
									 Friendika | 7eb7f77413 | use separate hcard from profile url | 2011-08-07 19:26:44 -07:00 |  |