include/class.forms.php · 41003fd57e5d99a8fb90d28b10e9806a0290c202 · docker / osticket · GitLab

Sep 06, 2018
2f7ab755
Merge branch 'develop' into develop-next · 2f7ab755
Peter Rotich authored Sep 06, 2018
```
Conflicts:
	include/class.forms.php
	scp/js/scp.js
```
2f7ab755
Merge branch 'develop' into develop-next
Peter Rotich authored Sep 06, 2018
```
Conflicts:
	include/class.forms.php
	scp/js/scp.js
```