Marius Burkard
2016-02-19 294a7b557cd280749c94404ce4d75483741d229a
refs
author Marius Burkard <m.burkard@pixcept.de>
Friday, February 19, 2016 07:37 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Friday, February 19, 2016 07:37 -0500
commit294a7b557cd280749c94404ce4d75483741d229a
tree 6e2931fab107e12f330741634bc25529caa35235 tree | zip | gz
parent 13d39110d0e473e2d3a5f1284ae01e3856d3aa3f view | diff
c1e0c661ea8b6837ad8c81465b9ff5076d18e897 view | diff
Merge branch 'stable-3.1'
7 files modified
39 ■■■■ changed files
install/tpl/nginx_apps.vhost.master 3 ●●●● diff | view | raw | blame | history
install/tpl/nginx_ispconfig.vhost.master 1 ●●●● diff | view | raw | blame | history
interface/lib/classes/client_templates.inc.php 13 ●●●● diff | view | raw | blame | history
interface/lib/classes/remote.d/sites.inc.php 2 ●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 8 ●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 10 ●●●●● diff | view | raw | blame | history
server/plugins-available/backup_plugin.inc.php 2 ●●● diff | view | raw | blame | history