Commit graph

5 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 5f2f644064 resolve file inclusion conflicts w/ multiple plugins, improve the typo checker 2011-02-21 20:19:33 -08:00
Mike Macgirvin 013d2604f8 inline salmon magic keys 2010-10-12 04:07:03 -07:00
Mike Macgirvin 9c10ada906 salmon-magic-public-freaking-nasty-keys 2010-10-06 21:13:15 -07:00