ISPConfig3 devel
parent: 2211cc | patch | commitdiff
Florian Schaal
2015-12-20 dedf5feaa2cf3072e90ac2bf2ef3885facd2e1a6
refs
author Florian Schaal <florian@schaal-24.de>
Sunday, December 20, 2015 04:39 -0500
committer Florian Schaal <florian@schaal-24.de>
Sunday, December 20, 2015 04:39 -0500
commitdedf5feaa2cf3072e90ac2bf2ef3885facd2e1a6
tree d16b9acc2a513d324e7096239664f62ccefda40a tree | zip | gz
parent 2211cc45c803ad270c205a01c895c46df2b4580c view | diff
216ea12666892397cd145cdef3c40d37b3df22a7 view | diff 
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
13 files modified
294 ■■■■■ changed files
interface/lib/classes/plugin.inc.php 108 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_actions.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 5 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tpl.inc.php 65 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tpl_cache.inc.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/directive_snippets_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_edit.htm 9 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 7 ●●●●● diff | view | raw | blame | history
server/lib/classes/plugins.inc.php 17 ●●●●● diff | view | raw | blame | history
server/lib/classes/tpl.inc.php 48 ●●●●● diff | view | raw | blame | history
server/lib/classes/tpl_cache.inc.php 9 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 5 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 6 ●●●●● diff | view | raw | blame | history