setup/tips.html · 72a7c3855868018b067b5e8e06a66a26eab99a9f · docker / osticket · GitLab

Snippets Groups Projects

11 years ago
7faf3026
Merge remote branch 'upstream-1.7/develop' into develop · 7faf3026
Jared Hancock authored 11 years ago
```
Conflicts:
	include/mysqli.php
	include/staff/faq-categories.inc.php
	setup/tips.html
```
7faf3026

History
Merge remote branch 'upstream-1.7/develop' into develop
Jared Hancock authored 11 years ago
```
Conflicts:
	include/mysqli.php
	include/staff/faq-categories.inc.php
	setup/tips.html
```