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
..
2017-04-26 11:40:33 +02:00
2017-03-01 01:22:26 +01:00
2017-04-26 11:40:33 +02:00
2017-01-15 22:33:11 +01:00
2017-04-26 20:18:21 +02:00
2017-04-26 20:18:21 +02:00
2017-04-26 11:40:33 +02:00
2017-02-01 15:39:48 +01:00
2017-01-15 22:33:11 +01:00
2017-01-15 22:33:11 +01:00
2017-04-26 11:40:33 +02:00
2017-01-12 02:54:45 +01:00
2017-03-23 01:25:23 +01:00
2017-01-31 00:51:33 +01:00
2017-02-23 11:26:44 +01:00
2017-04-26 11:40:32 +02:00
2017-04-27 01:34:15 +02:00
2017-03-06 20:53:59 +01:00
2017-04-30 12:17:46 +02:00
2017-01-23 03:45:45 +01:00
2017-04-26 11:40:32 +02:00
2017-04-26 11:40:32 +02:00
2017-02-19 23:31:04 +01:00
2017-01-12 02:54:45 +01:00
2017-01-12 02:54:45 +01:00
2017-03-01 03:25:19 +01:00
2017-01-23 15:26:28 +01:00
2017-04-26 11:40:32 +02:00