include/class.format.php · 59df52159bb8f8edf71112357978c9e51d543642 · docker / osticket · GitLab

Jun 08, 2015
100e531c
Merge remote branch 'upstream/develop' into develop-next · 100e531c
Jared Hancock authored Jun 08, 2015
```
Conflicts:
	include/class.format.php
```
100e531c
Merge remote branch 'upstream/develop' into develop-next
Jared Hancock authored Jun 08, 2015
```
Conflicts:
	include/class.format.php
```