include/class.auth.php · 72d21a3fd32513348b1120fd851db44168e36125 · docker / osticket · GitLab

Snippets Groups Projects

11 years ago
7d6a6990
Merge remote branch 'upstream/develop' into develop-next · 7d6a6990
Jared Hancock authored 11 years ago
```
Conflicts:
	include/class.client.php
	include/class.usersession.php
```
7d6a6990

History
Merge remote branch 'upstream/develop' into develop-next
Jared Hancock authored 11 years ago
```
Conflicts:
	include/class.client.php
	include/class.usersession.php
```