Jonathan White
9e2be34897
Merge branch 'develop'
Conflicts:
CMakeLists.txt
cmake/CLangFormat.cmake
snapcraft.yaml
src/CMakeLists.txt
src/core/Database.cpp
src/core/Database.h
src/core/Tools.cpp
src/crypto/CryptoHash.h
src/crypto/ssh/ASN1Key.h
src/crypto/ssh/OpenSSHKey.cpp
src/format/Kdbx4Reader.cpp
src/gui/DatabaseTabWidget.cpp
src/gui/DatabaseTabWidget.h
src/gui/DatabaseWidget.cpp
src/gui/DatabaseWidget.h
src/gui/DetailsWidget.cpp
src/gui/DetailsWidget.ui
src/gui/EditWidgetProperties.cpp
src/gui/EntryPreviewWidget.cpp
src/gui/EntryPreviewWidget.ui
src/gui/FileDialog.cpp
src/gui/dbsettings/DatabaseSettingsDialog.cpp
src/gui/dbsettings/DatabaseSettingsDialog.h
src/gui/group/EditGroupWidget.cpp
src/gui/group/EditGroupWidget.h
src/sshagent/ASN1Key.h
src/sshagent/OpenSSHKey.cpp
src/sshagent/SSHAgent.cpp
tests/CMakeLists.txt