Files
sysPass/css
nuxsmin 9377efd647 Merge branch 'devel'
Conflicts:
	.gitignore
	ajax/ajax_2fa.php
	ajax/ajax_accountSave.php
	ajax/ajax_appMgmtSave.php
	ajax/ajax_configSave.php
	ajax/ajax_doLogin.php
	ajax/ajax_files.php
	ajax/ajax_getEnvironment.php
	ajax/ajax_userPrefsSave.php
	ajax/ajax_viewpass.php
	css/alertify-bootstrap-3.min.css
	css/chosen-custom.min.css
	css/css.php
	inc/Account.class.php
	inc/AccountBase.class.php
	inc/AccountHistory.class.php
	inc/AccountSearch.class.php
	inc/Acl.class.php
	inc/ActionLog.class.php
	inc/Api.class.php
	inc/Auth.class.php
	inc/CsvImportBase.class.php
	inc/CustomFields.class.php
	inc/DB.class.php
	inc/Init.class.php
	inc/Installer.class.php
	inc/Ldap.class.php
	inc/LdapADS.class.php
	inc/Log.class.php
	inc/Request.class.php
	inc/SP/Core/Crypt.class.php
	inc/SP/Core/CryptMasterPass.class.php
	inc/SP/Core/Language.class.php
	inc/SP/Core/Session.class.php
	inc/SP/Html/Html.class.php
	inc/SP/Html/Minify.class.php
	inc/SessionUtil.class.php
	inc/Upgrade.class.php
	inc/UserBase.class.php
	inc/UserLdap.class.php
	inc/UserMigrate.class.php
	inc/UserPreferences.class.php
	inc/Util.class.php
	inc/dbstructure.sql
	inc/locales/ca_ES/LC_MESSAGES/messages.mo
	inc/locales/ca_ES/LC_MESSAGES/messages.po
	inc/locales/de_DE/LC_MESSAGES/messages.mo
	inc/locales/de_DE/LC_MESSAGES/messages.po
	inc/locales/en_US/LC_MESSAGES/messages.mo
	inc/locales/en_US/LC_MESSAGES/messages.po
	inc/locales/fr_FR/LC_MESSAGES/messages.mo
	inc/locales/fr_FR/LC_MESSAGES/messages.po
	inc/locales/hu_HU/LC_MESSAGES/messages.mo
	inc/locales/hu_HU/LC_MESSAGES/messages.po
	inc/locales/it_IT/LC_MESSAGES/messages.mo
	inc/locales/it_IT/LC_MESSAGES/messages.po
	inc/locales/nl_NL/LC_MESSAGES/messages.mo
	inc/locales/nl_NL/LC_MESSAGES/messages.po
	inc/locales/ru_RU/LC_MESSAGES/messages.mo
	inc/locales/ru_RU/LC_MESSAGES/messages.po
	inc/themes/classic/account.inc
	inc/themes/classic/categories.inc
	inc/themes/classic/config.inc
	inc/themes/classic/css/styles.min.css
	inc/themes/classic/customers.inc
	inc/themes/classic/customfields.inc
	inc/themes/classic/groups.inc
	inc/themes/classic/import.inc
	inc/themes/classic/js/functions.min.js
	inc/themes/classic/ldap.inc
	inc/themes/classic/mail.inc
	inc/themes/classic/mgmttabs.inc
	inc/themes/classic/preferences.inc
	inc/themes/classic/request.inc
	inc/themes/classic/search.inc
	inc/themes/classic/searchbox.inc
	inc/themes/classic/sessionbar.inc
	inc/themes/classic/tokens.inc
	inc/themes/classic/users.inc
	inc/themes/classic/wiki.inc
	inc/themes/material-blue/2fa.inc
	inc/themes/material-blue/account.inc
	inc/themes/material-blue/categories.inc
	inc/themes/material-blue/config.inc
	inc/themes/material-blue/css/alertify-custom.min.css
	inc/themes/material-blue/css/fonts.css
	inc/themes/material-blue/css/search-grid.css
	inc/themes/material-blue/css/styles.css
	inc/themes/material-blue/css/styles.min.css
	inc/themes/material-blue/customers.inc
	inc/themes/material-blue/encryption.inc
	inc/themes/material-blue/error.inc
	inc/themes/material-blue/groups.inc
	inc/themes/material-blue/import.inc
	inc/themes/material-blue/install.inc
	inc/themes/material-blue/js-common.inc
	inc/themes/material-blue/js/functions.min.js
	inc/themes/material-blue/js/material.min.js
	inc/themes/material-blue/ldap.inc
	inc/themes/material-blue/login.inc
	inc/themes/material-blue/mgmttabs.inc
	inc/themes/material-blue/passreset.inc
	inc/themes/material-blue/preferences.inc
	inc/themes/material-blue/profiles.inc
	inc/themes/material-blue/search.inc
	inc/themes/material-blue/searchbox.inc
	inc/themes/material-blue/tokens.inc
	inc/themes/material-blue/upgrade.inc
	inc/themes/material-blue/users.inc
	js/chosen.jquery.min.js
	js/clipboard.min.js
	js/functions.min.js
	js/js.php
	js/strings.js.php
	js/zxcvbn-async.min.js
	js/zxcvbn.min.js
	web/AccountC.class.php
	web/ConfigC.class.php
	web/MainC.class.php
	web/SearchC.class.php
	web/UsersMgmtC.class.php
	web/UsersPrefsC.class.php
2017-02-13 00:38:47 +01:00
..
2017-01-12 02:54:45 +01:00
2017-01-12 02:54:45 +01:00
2017-01-12 02:54:45 +01:00
2017-01-12 02:54:45 +01:00
2017-01-12 02:54:45 +01:00
2017-01-12 02:54:45 +01:00
2017-01-12 09:37:50 +01:00