Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master interface/lib/config.inc.php interface/web/themes/blue/ispconfig_version
No related branches found
No related tags found
Showing
- install/lib/update.lib.php 9 additions, 2 deletionsinstall/lib/update.lib.php
- install/sql/incremental/upd_0003.sql 0 additions, 1 deletioninstall/sql/incremental/upd_0003.sql
- install/sql/incremental/upd_0050.sql 17 additions, 0 deletionsinstall/sql/incremental/upd_0050.sql
- install/sql/incremental/upd_0068.sql 1 addition, 1 deletioninstall/sql/incremental/upd_0068.sql
- install/sql/incremental/upd_0071.sql 1 addition, 2 deletionsinstall/sql/incremental/upd_0071.sql
- install/sql/incremental/upd_0074.sql 250 additions, 0 deletionsinstall/sql/incremental/upd_0074.sql
- install/sql/incremental/upd_0075.sql 80 additions, 0 deletionsinstall/sql/incremental/upd_0075.sql
- install/sql/ispconfig3.sql 165 additions, 164 deletionsinstall/sql/ispconfig3.sql
- interface/web/client/client_edit.php 3 additions, 3 deletionsinterface/web/client/client_edit.php
- interface/web/dashboard/templates/dashboard.htm 1 addition, 1 deletioninterface/web/dashboard/templates/dashboard.htm
- interface/web/themes/blue/ispconfig_version 1 addition, 1 deletioninterface/web/themes/blue/ispconfig_version
Loading
Please register or sign in to comment