include/class.usersession.php · d66dbfa83b8614a5314c3d24a98d8cd12d4d8263 · docker / osticket · GitLab

Snippets Groups Projects

11 years ago
72d21a3f
Merge remote branch 'upstream/develop-next' into develop-next · 72d21a3f
Peter Rotich authored 11 years ago
```
Conflicts:
	include/class.client.php
	include/class.usersession.php
```
72d21a3f

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