nuxsmin b7ba0f1d1c Merge branch 'master' into auth ...

Conflicts:
	inc/SP/Auth/Ldap/LdapBase.class.php
	inc/SP/Controller/ItemShowController.class.php
	inc/SP/Controller/LoginController.class.php
	inc/SP/Core/Init.class.php
	inc/SP/Util/Util.class.php
	inc/locales/en_US/LC_MESSAGES/messages.mo
	inc/locales/en_US/LC_MESSAGES/messages.po
	inc/themes/material-blue/css/styles.min.css
	inc/themes/material-blue/views/main/login.inc
	js/app-main.min.js
	js/app-triggers.min.js

2017-04-30 12:17:46 +02:00

22 KiB

Raw Blame History

View Raw