Commit Graph

4 Commits (1fda9e9365c62cc61788e25d6c7d802f5065fbc8)

Author SHA1 Message Date
Fabio Comuni 6af5a3a485 escape email template var names. fix bug n385. 2012-04-20 11:39:36 +02:00
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 4240a23a8a i18n re-arrange 2010-11-15 23:27:12 -08:00