ISPConfig3 devel
parent: cd9e80 | patch | commitdiff
Marius Cramer
2014-03-06 35b30fa77ef939f85b6d31446e8710e8f03486b6
refs
author Marius Cramer <m.cramer@pixcept.de>
Thursday, March 6, 2014 03:08 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Thursday, March 6, 2014 03:08 -0500
commit35b30fa77ef939f85b6d31446e8710e8f03486b6
tree 85004344dbee4bc77dc3229480656278de92d694 tree | zip | gz
parent cd9e802b9f36c572d6ca9246c47f6795efccae22 view | diff
623d691ab9309f25d144b5e421da64b70e07dc22 view | diff 
 Merge branch 'master' into 'master'

Master
4 files added
10 files modified
274 ■■■■■ changed files
interface/web/dns/dns_dkim_edit.php 18 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_dkim_get.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_edit.php 41 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_quota_stats.php 79 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_database_quota_stats_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/module.conf.php 5 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/database_quota_stats.list.php 52 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_quota_stats_list.htm 54 ●●●●● diff | view | raw | blame | history
server/conf/mail/db_quota_notification_de.txt 2 ●●●●● diff | view | raw | blame | history
server/conf/mail/db_quota_notification_en.txt 2 ●●●●● diff | view | raw | blame | history
server/conf/mail/db_quota_ok_notification_de.txt 2 ●●●●● diff | view | raw | blame | history
server/scripts/ispconfig_update.php 2 ●●●●● diff | view | raw | blame | history