mirror of
https://github.com/nuxsmin/sysPass.git
synced 2026-03-03 15:14:08 +01:00
# Conflicts: # app/modules/web/themes/material-blue/views/account/account.inc # app/modules/web/themes/material-blue/views/account/search-rows.inc # app/modules/web/themes/material-blue/views/config/ldap.inc # composer.json # composer.lock # lib/SP/Bootstrap.php # lib/SP/Core/Language.php # lib/SP/Html/Html.php # lib/SP/Infrastructure/Database/DatabaseUtil.php # lib/SP/Providers/Auth/Ldap/LdapActions.php # lib/SP/Services/Account/AccountSearchItem.php # lib/SP/Services/Install/Installer.php