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/Entry.h
+++ b/src/core/Entry.h
@@ -142,6 +142,7 @@ public:
     */
    Entry* clone(CloneFlags flags) const;
    void copyDataFrom(const Entry* other);
+    QString maskPasswordPlaceholders(const QString& str) const;
    QString resolveMultiplePlaceholders(const QString& str) const;
    QString resolvePlaceholder(const QString& str) const;
    QString resolveUrl(const QString& url) const;