include/mysqli.php · a3114942ed5a9fa21c499081b2f2aff0a0386926 · docker / osticket · GitLab

Snippets Groups Projects

11 years ago
9596cf3a
Merge remote branch 'upstream/develop' into develop-next · 9596cf3a
Jared Hancock authored 11 years ago
```
Conflicts:
	include/staff/templates/user-lookup.tmpl.php
```
9596cf3a

History
Merge remote branch 'upstream/develop' into develop-next
Jared Hancock authored 11 years ago
```
Conflicts:
	include/staff/templates/user-lookup.tmpl.php
```