Marius Cramer
2014-05-19 9b4702d833708415d0cf05a98a00aac1bc850ff7
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, May 19, 2014 08:55 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Monday, May 19, 2014 08:55 -0400
commit9b4702d833708415d0cf05a98a00aac1bc850ff7
tree c34fd31887a39c48c7b105d07ad16cc396652b1d tree | zip | gz
parent f1634087ea8a852b58ec13d5099e94771ed80849 view | diff
58023ffd5ffbacac99776debf72aff6f49378200 view | diff
 Merge branch 'master' into 'master'

Master
2 files modified
12 ■■■■■ changed files
server/lib/classes/cron.d/100-monitor_email_quota.inc.php 10 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 2 ●●● diff | view | raw | blame | history