Merge remote branch 'upstream/develop-next' into develop-next
Conflicts: file.php include/class.file.php include/class.thread.php
No related branches found
No related tags found
Showing
- file.php 2 additions, 1 deletionfile.php
- include/ajax.search.php 1 addition, 1 deletioninclude/ajax.search.php
- include/ajax.tasks.php 4 additions, 4 deletionsinclude/ajax.tasks.php
- include/ajax.tickets.php 7 additions, 7 deletionsinclude/ajax.tickets.php
- include/class.attachment.php 5 additions, 1 deletioninclude/class.attachment.php
- include/class.canned.php 1 addition, 1 deletioninclude/class.canned.php
- include/class.file.php 4 additions, 2 deletionsinclude/class.file.php
- include/class.format.php 4 additions, 4 deletionsinclude/class.format.php
- include/class.forms.php 56 additions, 16 deletionsinclude/class.forms.php
- include/class.list.php 3 additions, 0 deletionsinclude/class.list.php
- include/class.queue.php 133 additions, 47 deletionsinclude/class.queue.php
- include/class.search.php 92 additions, 6 deletionsinclude/class.search.php
- include/class.thread.php 8 additions, 9 deletionsinclude/class.thread.php
- include/class.ticket.php 36 additions, 12 deletionsinclude/class.ticket.php
- open.php 1 addition, 1 deletionopen.php
- scp/tasks.php 2 additions, 2 deletionsscp/tasks.php
- scp/tickets.php 3 additions, 3 deletionsscp/tickets.php
- tickets.php 1 addition, 1 deletiontickets.php
Loading
Please register or sign in to comment