include/mysqli.php · 121040ec2fb797fe010e7d25f594bcb408756800 · docker / osticket · GitLab

Snippets Groups Projects

"cmd/merge/.gitignore" did not exist on "b2d77d9fb89cdf06657fdbf05649c834437c0114"

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
```