Merge remote-tracking branch 'upstream/develop' into develop

2018-05-10 22:34:38 +03:00
parent bbfac92672 dee7572c5d
commit 30ccc102d2
53 changed files with 9817 additions and 1144 deletions
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -135,6 +135,7 @@ void Config::init(const QString& fileName)
    m_defaults.insert("AutoTypeEntryTitleMatch", true);
    m_defaults.insert("AutoTypeEntryURLMatch", true);
    m_defaults.insert("AutoTypeDelay", 25);
+    m_defaults.insert("AutoTypeStartDelay", 500);
    m_defaults.insert("UseGroupIconOnEntryCreation", true);
    m_defaults.insert("IgnoreGroupExpansion", true);
    m_defaults.insert("security/clearclipboard", true);