Till Brehm
2016-04-07 98f80bef24f11594d7690162c376c3b56c449644
refs
author Till Brehm <tbrehm@ispconfig.org>
Thursday, April 7, 2016 12:17 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Thursday, April 7, 2016 12:17 -0400
commit98f80bef24f11594d7690162c376c3b56c449644
tree 1e7e71b28202152aedc8c6a3e45bf4c84bbab7f5 tree | zip | gz
parent dc89796900c48363002fb8254848e7bb79c428b4 view | diff
9ae44824aa54f4c68db9490dec8d93f17945b1f7 view | diff
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
19 files modified
98 ■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 2 ●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 4 ●●● diff | view | raw | blame | history
interface/web/dns/form/dns_template.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_wizard.htm 12 ●●●● diff | view | raw | blame | history
interface/web/login/index.php 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/ar.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/bg.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/de.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/en.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/hr.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/id.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/nl.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/pl.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/ro.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/se.lng 2 ●●● diff | view | raw | blame | history
interface/web/login/lib/lang/sk.lng 2 ●●● diff | view | raw | blame | history
server/lib/classes/cron.d/550-bind_dnssec.inc.php 50 ●●●● diff | view | raw | blame | history