ISPConfig3 devel
parent: 108dd9 | patch | commitdiff
Marius Cramer
2014-11-27 b553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9
refs
author Marius Cramer <m.cramer@pixcept.de>
Thursday, November 27, 2014 02:31 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Thursday, November 27, 2014 02:31 -0500
commitb553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9
tree d96cb64c3c604c083eb11965999d0baf04b26851 tree | zip | gz
parent 108dd9249196fbcdd5965226e679142a6a0374f5 view | diff
f6174df192779fc7e1b6ce7b39e9682bb79d555c view | diff 
Merge remote-tracking branch 'ispc/master' into new-layout-3.1
16 files modified
344 ■■■■■ changed files
interface/web/admin/form/users.tform.php 13 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_users.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_users.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/users_user_edit.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/de.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/en.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/login/password_reset.php 75 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_dkim_create.php 2 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup.inc.php 66 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup_mail.inc.php 38 ●●●●● diff | view | raw | blame | history
server/lib/classes/system.inc.php 16 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 18 ●●●●● diff | view | raw | blame | history
server/plugins-available/backup_plugin.inc.php 38 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin.inc.php 36 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 22 ●●●●● diff | view | raw | blame | history