include/class.forms.php · d66dbfa83b8614a5314c3d24a98d8cd12d4d8263 · docker / osticket · GitLab

Feb 11, 2014
411e03cc
Merge remote branch 'upstream/develop' into develop-next · 411e03cc
Jared Hancock authored Feb 11, 2014
```
Conflicts:
	include/class.forms.php
```
411e03cc
Merge remote branch 'upstream/develop' into develop-next
Jared Hancock authored Feb 11, 2014
```
Conflicts:
	include/class.forms.php
```