scp/js/scp.js · a9f4b0fdd0c3f119c93044b04b10091369a0efb6 · docker / osticket · GitLab

Snippets Groups Projects

6 years ago
54d0cb2c
Merge remote branch 'upstream/develop' into develop-next · 54d0cb2c
Peter Rotich authored 6 years ago
```
Conflicts:
	include/client/header.inc.php
	scp/js/scp.js
```
54d0cb2c

History
Merge remote branch 'upstream/develop' into develop-next
Peter Rotich authored 6 years ago
```
Conflicts:
	include/client/header.inc.php
	scp/js/scp.js
```