include/class.export.php · d5e8ac091252c2e0e547a1867ad1e162ed196911 · docker / osticket · GitLab

Snippets Groups Projects

10 years ago
4e1ddbec
Merge remote branch 'upstream/develop' into develop-next · 4e1ddbec
Jared Hancock authored 10 years ago
```
Conflicts:
	include/class.export.php
	include/client/login.inc.php
	include/staff/ticket-view.inc.php
```
4e1ddbec

History
Merge remote branch 'upstream/develop' into develop-next
Jared Hancock authored 10 years ago
```
Conflicts:
	include/class.export.php
	include/client/login.inc.php
	include/staff/ticket-view.inc.php
```