Merge remote-tracking branch 'ispc3master/master'
Conflicts: install/sql/incremental/upd_0063.sql
No related branches found
No related tags found
Showing
- install/lib/install.lib.php 17 additions, 0 deletionsinstall/lib/install.lib.php
- install/lib/installer_base.lib.php 9 additions, 0 deletionsinstall/lib/installer_base.lib.php
- install/sql/incremental/upd_0049.sql 0 additions, 1 deletioninstall/sql/incremental/upd_0049.sql
- install/sql/incremental/upd_0052.sql 0 additions, 4 deletionsinstall/sql/incremental/upd_0052.sql
- install/sql/incremental/upd_0055.sql 0 additions, 2 deletionsinstall/sql/incremental/upd_0055.sql
- install/sql/incremental/upd_0065.sql 7 additions, 0 deletionsinstall/sql/incremental/upd_0065.sql
- install/sql/ispconfig3.sql 32 additions, 1 deletioninstall/sql/ispconfig3.sql
- interface/lib/classes/client_templates.inc.php 3 additions, 1 deletioninterface/lib/classes/client_templates.inc.php
- interface/lib/classes/custom_datasource.inc.php 1 addition, 1 deletioninterface/lib/classes/custom_datasource.inc.php
- interface/lib/classes/ispcmail.inc.php 1 addition, 0 deletionsinterface/lib/classes/ispcmail.inc.php
- interface/lib/classes/remote.d/admin.inc.php 109 additions, 0 deletionsinterface/lib/classes/remote.d/admin.inc.php
- interface/lib/classes/remoting.inc.php 0 additions, 1 deletioninterface/lib/classes/remoting.inc.php
- interface/lib/classes/tform_base.inc.php 1 addition, 0 deletionsinterface/lib/classes/tform_base.inc.php
- interface/lib/classes/tpl.inc.php 59 additions, 50 deletionsinterface/lib/classes/tpl.inc.php
- interface/web/admin/lib/lang/en_users.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/en_users.lng
- interface/web/admin/lib/remote.conf.php 1 addition, 0 deletionsinterface/web/admin/lib/remote.conf.php
- interface/web/admin/templates/server_config_web_edit.htm 2 additions, 2 deletionsinterface/web/admin/templates/server_config_web_edit.htm
- interface/web/admin/users_edit.php 7 additions, 0 deletionsinterface/web/admin/users_edit.php
- interface/web/client/client_edit.php 133 additions, 1 deletioninterface/web/client/client_edit.php
- interface/web/client/client_message.php 1 addition, 1 deletioninterface/web/client/client_message.php
Loading
Please register or sign in to comment