include/mysqli.php · 398cbc7d1c4a23188b11a0aa4b4aa5c9ae236226 · docker / osticket · GitLab

Jan 20, 2014
fd5e1d8d
Merge remote branch 'upstream-1.7/develop' into develop · fd5e1d8d
Jared Hancock authored Jan 20, 2014
```
Conflicts:
	include/mysqli.php
```
fd5e1d8d
Merge remote branch 'upstream-1.7/develop' into develop
Jared Hancock authored Jan 20, 2014
```
Conflicts:
	include/mysqli.php
```