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
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 338ba48554 more templates 2011-04-07 18:00:35 -07:00
Friendika efd8ab6c72 more i18n reorg 2010-11-16 01:14:04 -08:00
Mike Macgirvin 071d3affb9 change wording on publish to site directory 2010-08-19 22:27:51 -07:00
Mike Macgirvin d733b39b2d direcotry cleanups 2010-07-09 03:10:28 -07:00
Mike Macgirvin 6348e70daa Initial checkin 2010-07-01 16:48:07 -07:00