| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Friendika | 4043ede080 | more templates | 2011-04-06 23:03:54 -07:00 |  | 
			
				
					| 
							
							
								 Friendika | 4240a23a8a | i18n re-arrange | 2010-11-15 23:27:12 -08:00 |  | 
			
				
					| 
							
							
								 Mike Macgirvin | 0f47ac282c | celebrity/group/community pages about 75% implemented | 2010-10-17 20:04:17 -07:00 |  | 
			
				
					| 
							
							
								 Mike Macgirvin | 83ee7909cd | password reset | 2010-07-18 01:24:51 -07:00 |  |