Commit graph

7 commits

Author SHA1 Message Date
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
Abinoam P. Marques Jr d89a0449d0 htconfig.tpl - Friendika -> Friendica 2012-02-20 19:47:44 -03: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
friendica 01cae9a50a remove all plugins from default config 2011-12-12 16:28:33 -08:00
Friendika 2d2b500639 input the admin email address during install/setup. 2011-07-07 19:12:35 -07:00
Friendika 59fd70e568 issues with private photos - hitting internal size limits 2011-05-04 02:20:44 -07:00
Friendika e88cf38604 spanish translation update 2011-04-14 15:20:25 -07:00