Merge branch 'release/2.2.1' into develop

This commit is contained in:
Janek Bevendorff 2017-07-01 10:09:06 +02:00
commit 6e44eed9fe
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
10 changed files with 209 additions and 193 deletions

View file

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