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
Tobias Diekershoff 41bba5534e german translation of register_open_eml.tpl 2011-01-21 10:23:10 +01:00
Tobias Diekershoff 10be4f6d29 german translation of register_verify_eml.tpl 2011-01-21 10:14:29 +01:00
Tobias Diekershoff a118f83ee2 initial stuff for the german translation 2011-01-14 10:28:19 +01:00