Files
Rubén D 0b02c8fdbf Merge branch 'v3.2' into feature/cli_module
# Conflicts:
#	composer.json
#	composer.lock
#	lib/SP/Providers/Auth/Ldap/LdapMsAds.php
#	lib/SP/Services/Install/Installer.php
#	lib/SP/Util/Checks.php
#	lib/SP/Util/Link.php
#	public/js/app-actions.min.js
#	public/js/app-util.min.js
#	tests/res/scripts/reset_db.sh
2021-09-19 21:40:27 +02:00
..
2020-12-08 10:10:10 +01:00