Files
sysPass/app/modules
Rubén D cd4369e74e Merge branch 'master' into feat/code_refactoring
# 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
2022-11-13 09:18:55 +01:00
..