include/staff/faq-categories.inc.php · 9f4ad94d35bb914e73236b4eee8f3281a32e125e · docker / osticket · GitLab

Snippets Groups Projects

11 years ago
bf956865
Merge remote branch 'upstream-1.7/develop' into develop · bf956865
Jared Hancock authored 11 years ago
```
Include changes made just before 1.7.3 release

Conflicts:
	include/ajax.config.php
	include/class.ticket.php
```
bf956865

History
Merge remote branch 'upstream-1.7/develop' into develop
Jared Hancock authored 11 years ago
```
Include changes made just before 1.7.3 release

Conflicts:
	include/ajax.config.php
	include/class.ticket.php
```