| 
								
								
									 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 | 53653f6a4d | consolidate perrmisions sql, minor duepuntozero validation fixes | 2011-06-30 17:35:35 -07:00 |  | 
				
					
						| 
								
								
									 Friendika | 2a679b1164 | file attachments | 2011-05-25 02:08:15 -07:00 |  |