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

Snippets Groups Projects

11 years ago
6e5dd23e
Merge remote branch 'upstream/develop' into develop-next · 6e5dd23e
Jared Hancock authored 11 years ago
```
Conflicts:
	include/class.user.php
	include/staff/tickets.inc.php
```
6e5dd23e

History
Merge remote branch 'upstream/develop' into develop-next
Jared Hancock authored 11 years ago
```
Conflicts:
	include/class.user.php
	include/staff/tickets.inc.php
```