include/mysqli.php · 370bacaeee8f77dacf13142d7b05cbf9bc35cb59 · docker / osticket · GitLab

Snippets Groups Projects

11 years ago
5c676b43
Merge remote branch 'upstream-1.7/develop' into develop · 5c676b43
Jared Hancock authored 11 years ago
```
Conflicts:
	include/class.http.php
	include/mysqli.php
```
5c676b43

History
Merge remote branch 'upstream-1.7/develop' into develop
Jared Hancock authored 11 years ago
```
Conflicts:
	include/class.http.php
	include/mysqli.php
```