bootstrap.php · 78548148596755d250bb40f73b2cc805459235a2 · docker / osticket · GitLab

Snippets Groups Projects

11 years ago
78548148
Merge remote branch 'upstream-1.7/develop' into develop · 78548148
Jared Hancock authored 11 years ago
```
Include changes in 1.7.1.1

Conflicts:
	main.inc.php
```
78548148

History
Merge remote branch 'upstream-1.7/develop' into develop
Jared Hancock authored 11 years ago
```
Include changes in 1.7.1.1

Conflicts:
	main.inc.php
```