ISPConfig3 devel
parent: 9e0cb0 | patch | commitdiff
Florian Schaal
2014-12-06 5e3aadc044ac6b55fb6b247287f886f60cb71733
refs
author Florian Schaal <florian@schaal-24.de>
Saturday, December 6, 2014 15:47 -0500
committer Florian Schaal <florian@schaal-24.de>
Saturday, December 6, 2014 15:47 -0500
commit5e3aadc044ac6b55fb6b247287f886f60cb71733
tree 6ee49672b8b5e9fe23b3805a6896beac6bcc9976 tree | zip | gz
parent 9e0cb0162a2ae8a2f4b102abefe7acfb120dd175 view | diff
1fa8f425b71db332a03ceef2d1e165083d0ba241 view | diff 
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
5 files added
11 files modified
182 ■■■■■ changed files
install/sql/incremental/upd_0079.sql 2 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/plugin_directive_snippets.inc.php 72 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/directive_snippets.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_directive_snippets.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_directive_snippets.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/directive_snippets_edit.htm 17 ●●●●● diff | view | raw | blame | history
interface/web/sites/ajax_get_json.php 11 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_domain.tform.php 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_directive_snippets.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_directive_snippets.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_directive_snippets.htm 14 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_edit.htm 23 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 6 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 11 ●●●●● diff | view | raw | blame | history