-
Marius Cramer authored
Conflicts: interface/lib/classes/tpl.inc.php interface/web/mail/lib/lang/de_spamfilter_blacklist.lng interface/web/mail/lib/lang/de_spamfilter_users.lng interface/web/mail/lib/lang/de_spamfilter_whitelist.lng server/lib/classes/tpl.inc.php
d4d1ead7