Commit graph

6 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 93a8907f43 force login to ssl on SSL_POLICY_SELFSIGN 2012-03-14 21:29:44 -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 a247a3cedb another template down 2011-02-23 20:43:22 -08:00
Friendika f9d5aafe9c finish moving english files 2010-11-16 20:13:18 -08:00
Mike Macgirvin 6348e70daa Initial checkin 2010-07-01 16:48:07 -07:00