include/ajax.config.php · a21adaa6e97094077ae2ae5cef7c1c340612cec0 · docker / osticket · GitLab

Snippets Groups Projects

You need to sign in or sign up before continuing.

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
```