include/staff/template.inc.php · cea82ae3b8dac190b55dcc0c09a9a2cde6e7de2d · 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
```

template.inc.php 6.50 KiB