Merge remote-tracking branch 'origin/stable-3.0.5'
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
Please register or sign in to comment