Merge branch 'release' into develop
Conflicts: include/client/view.inc.php include/staff/ticket-view.inc.php
No related branches found
No related tags found
Showing
- client.inc.php 2 additions, 1 deletionclient.inc.php
- include/class.email.php 6 additions, 1 deletioninclude/class.email.php
- include/class.staff.php 5 additions, 4 deletionsinclude/class.staff.php
- include/class.upgrader.php 8 additions, 4 deletionsinclude/class.upgrader.php
- include/client/view.inc.php 1 addition, 1 deletioninclude/client/view.inc.php
- include/staff/department.inc.php 3 additions, 1 deletioninclude/staff/department.inc.php
- include/staff/ticket-view.inc.php 2 additions, 2 deletionsinclude/staff/ticket-view.inc.php
- include/upgrader/streams/core/98ae1ed2-e342f869.patch.sql 0 additions, 6 deletionsinclude/upgrader/streams/core/98ae1ed2-e342f869.patch.sql
- include/upgrader/streams/core/9f3b454c-c0fd16f4.patch.sql 2 additions, 2 deletionsinclude/upgrader/streams/core/9f3b454c-c0fd16f4.patch.sql
- include/upgrader/streams/core/c00511c7-7be60a84.patch.sql 2 additions, 4 deletionsinclude/upgrader/streams/core/c00511c7-7be60a84.patch.sql
- include/upgrader/streams/core/f8856d56-abe9c0cb.patch.sql 1 addition, 2 deletionsinclude/upgrader/streams/core/f8856d56-abe9c0cb.patch.sql
- offline.php 1 addition, 3 deletionsoffline.php
- setup/cli/package.php 9 additions, 8 deletionssetup/cli/package.php
- setup/inc/header.inc.php 1 addition, 1 deletionsetup/inc/header.inc.php
- setup/js/jquery-1.6.2.min.js 0 additions, 18 deletionssetup/js/jquery-1.6.2.min.js
Loading
Please register or sign in to comment