Merge branch 'release/2.2.1' into develop

2017-06-29 03:23:14 +02:00
parent 4a6fddf280 a766052243
commit 8a36322e28
7 changed files with 32 additions and 6 deletions
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -129,6 +129,7 @@ void Config::init(const QString& fileName)
    m_defaults.insert("security/passwordsrepeat", false);
    m_defaults.insert("security/passwordscleartext", false);
    m_defaults.insert("security/autotypeask", true);
+    m_defaults.insert("security/IconDownloadFallbackToGoogle", false);
    m_defaults.insert("GUI/Language", "system");
    m_defaults.insert("GUI/ShowTrayIcon", false);
    m_defaults.insert("GUI/MinimizeToTray", false);