nuxsmin 5ed0b89a42 Merge branch 'auth' into devel ...

Conflicts:
	ajax/ajax_getEnvironment.php
	inc/SP/Auth/Ldap/LdapMsAds.class.php
	inc/SP/Auth/Ldap/LdapStd.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
	js/app-main.js
	js/app-main.min.js
	js/app-triggers.min.js
	js/strings.js.php

2017-09-18 20:12:11 +02:00

3.4 KiB

Raw Blame History

View Raw