Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
Showing
- install/sql/incremental/upd_0079.sql 2 additions, 0 deletionsinstall/sql/incremental/upd_0079.sql
- install/sql/ispconfig3.sql 2 additions, 0 deletionsinstall/sql/ispconfig3.sql
- interface/lib/classes/plugin_directive_snippets.inc.php 72 additions, 0 deletionsinterface/lib/classes/plugin_directive_snippets.inc.php
- interface/web/admin/form/directive_snippets.tform.php 6 additions, 0 deletionsinterface/web/admin/form/directive_snippets.tform.php
- interface/web/admin/lib/lang/de_directive_snippets.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/de_directive_snippets.lng
- interface/web/admin/lib/lang/en_directive_snippets.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/en_directive_snippets.lng
- interface/web/admin/templates/directive_snippets_edit.htm 17 additions, 0 deletionsinterface/web/admin/templates/directive_snippets_edit.htm
- interface/web/sites/ajax_get_json.php 11 additions, 0 deletionsinterface/web/sites/ajax_get_json.php
- interface/web/sites/form/web_vhost_domain.tform.php 7 additions, 1 deletioninterface/web/sites/form/web_vhost_domain.tform.php
- interface/web/sites/lib/lang/de_web_directive_snippets.lng 3 additions, 0 deletionsinterface/web/sites/lib/lang/de_web_directive_snippets.lng
- interface/web/sites/lib/lang/en_web_directive_snippets.lng 3 additions, 0 deletionsinterface/web/sites/lib/lang/en_web_directive_snippets.lng
- interface/web/sites/templates/web_directive_snippets.htm 14 additions, 0 deletionsinterface/web/sites/templates/web_directive_snippets.htm
- interface/web/sites/templates/web_vhost_domain_edit.htm 21 additions, 2 deletionsinterface/web/sites/templates/web_vhost_domain_edit.htm
- interface/web/sites/web_vhost_domain_edit.php 1 addition, 1 deletioninterface/web/sites/web_vhost_domain_edit.php
- server/plugins-available/apache2_plugin.inc.php 6 additions, 0 deletionsserver/plugins-available/apache2_plugin.inc.php
- server/plugins-available/nginx_plugin.inc.php 10 additions, 1 deletionserver/plugins-available/nginx_plugin.inc.php
Loading
Please register or sign in to comment