mirror of
https://github.com/nuxsmin/sysPass.git
synced 2026-02-20 09:51:25 +01:00
# 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