client.inc.php · 30c54e156838ae97ba88831cc3a61c56ed569e24 · docker / osticket · GitLab

Snippets Groups Projects

11 years ago
bd5bb881
Merge branch 'develop' into develop-next · bd5bb881
Jared Hancock authored 11 years ago
```
Conflicts:
	include/staff/template.inc.php
	scp/js/scp.js
```
bd5bb881

History
Merge branch 'develop' into develop-next
Jared Hancock authored 11 years ago
```
Conflicts:
	include/staff/template.inc.php
	scp/js/scp.js
```