Commit Graph

5 Commits (1fda9e9365c62cc61788e25d6c7d802f5065fbc8)

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 96620520a8 wording in email template adjusted 2011-01-22 09:20:52 +01:00
Tobias Diekershoff 80e77516c8 german translation of cmnt_received_eml.tpl 2011-01-18 11:24:52 +01:00
Tobias Diekershoff a118f83ee2 initial stuff for the german translation 2011-01-14 10:28:19 +01:00