Skip to content
Snippets Groups Projects
Commit d4d1ead7 authored by Marius Cramer's avatar Marius Cramer
Browse files

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
parents f0bed3a1 42b689d1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 473 additions and 504 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment