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

# Conflicts: # src/core/Group.cpp
2017-10-01 11:10:10 -04:00
parent be312bbe4f 2bce9c8add
commit 14e3d9d576
56 changed files with 13872 additions and 6723 deletions
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -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);