Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
Showing
- install/dist/lib/fedora.lib.php 2 additions, 2 deletionsinstall/dist/lib/fedora.lib.php
- install/sql/incremental/upd_0066.sql 2 additions, 0 deletionsinstall/sql/incremental/upd_0066.sql
- install/sql/ispconfig3.sql 4 additions, 4 deletionsinstall/sql/ispconfig3.sql
- install/tpl/fedora_postfix.conf.master 1 addition, 1 deletioninstall/tpl/fedora_postfix.conf.master
- interface/lib/app.inc.php 34 additions, 8 deletionsinterface/lib/app.inc.php
- interface/web/admin/lib/remote.conf.php 1 addition, 1 deletioninterface/web/admin/lib/remote.conf.php
- interface/web/admin/system_config_edit.php 1 addition, 2 deletionsinterface/web/admin/system_config_edit.php
- interface/web/tools/lib/lang/en_resync.lng 1 addition, 0 deletionsinterface/web/tools/lib/lang/en_resync.lng
- interface/web/tools/resync.php 45 additions, 0 deletionsinterface/web/tools/resync.php
- interface/web/tools/templates/resync.htm 6 additions, 0 deletionsinterface/web/tools/templates/resync.htm
- server/plugins-available/apache2_plugin.inc.php 1 addition, 1 deletionserver/plugins-available/apache2_plugin.inc.php
- server/plugins-available/nginx_plugin.inc.php 1 addition, 1 deletionserver/plugins-available/nginx_plugin.inc.php
Loading
Please register or sign in to comment