Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-20 10:45:33 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source 
# Conflicts:
#	src/core/Group.cpp
This commit is contained in:
Jonathan White 2017-10-01 11:10:10 -04:00
commit 14e3d9d576
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
56 changed files with 13872 additions and 6723 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/Config.cpp
View file

@ -122,7 +122,7 @@ void Config::init(const QString& fileName)
m_defaults.insert("AutoTypeEntryURLMatch", true);
m_defaults.insert("AutoTypeDelay", 25);
m_defaults.insert("UseGroupIconOnEntryCreation", true);
m_defaults.insert("IgnoreGroupExpansion", false);
m_defaults.insert("IgnoreGroupExpansion", true);
m_defaults.insert("security/clearclipboard", true);
m_defaults.insert("security/clearclipboardtimeout", 10);
m_defaults.insert("security/lockdatabaseidle", false);