ISPConfig3 devel
parent: 842b5c | patch | commitdiff
Marius Cramer
2015-09-12 6cdb029df901248cf6f9bbd74586cc6f62051fee
refs
author Marius Cramer <m.cramer@pixcept.de>
Saturday, September 12, 2015 02:37 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Saturday, September 12, 2015 02:37 -0400
commit6cdb029df901248cf6f9bbd74586cc6f62051fee
tree 451885bc875dceba573e95171ebb25942430f0d5 tree | zip | gz
parent 842b5c34e70869b7b1a0d368cbb6280f737301d3 view | diff
a5d7331041afed8dca79d67914a6ba50adbc8681 view | diff 
Merge branch 'master' into 'master'

Master

See merge request !226
2 files modified
6 ■■■■■ changed files
install/tpl/fedora_amavisd_conf.master 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_user_stats_list.lng 4 ●●●●● diff | view | raw | blame | history