Marius Cramer
2014-01-24 8828f85084203f52c9548872e880d5922e448d5f
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, January 24, 2014 04:05 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Friday, January 24, 2014 04:05 -0500
commit8828f85084203f52c9548872e880d5922e448d5f
tree d32ac8ee965bc10483df2e1b46f516ffccdf6f75 tree | zip | gz
parent 88d47d2ce65e549ffccda213f4e53609cc75d882 view | diff
9a02e2405f8296c50de0e5a493f6674a80856910 view | diff
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
interface/web/sites/web_aliasdomain_edit.php
5 files modified
54 ■■■■■ changed files
interface/web/admin/templates/server_config_mail_edit.htm 4 ●●●● diff | view | raw | blame | history
interface/web/sites/web_aliasdomain_edit.php 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/sites/web_subdomain_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_subdomain_edit.php 34 ●●●●● diff | view | raw | blame | history