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		2018-12-18 22:28:56 -05:00
..
icons	Merge branch 'develop'	2018-12-18 22:28:56 -05:00
linux	Bumped version number to 2.4.0-preview	2018-09-16 10:28:39 -04:00
macosx	Fix macOS building and code signing, resolves #1344	2018-01-13 23:49:24 +01:00
translations	Update translations from Transifex	2018-12-01 10:54:55 +01:00
windows	Kills keepassxc-proxy and KeePassXC during install or uninstall under Windows	2018-02-27 21:29:00 +01:00
wizard	Add a new database settings wizard	2018-09-25 21:12:47 +02:00
wordlists	remove short wordlists	2017-03-22 00:00:23 +01:00
about-contributors.html	Enhancements to About dialog and add settings button to toolbar	2018-08-20 21:27:37 -04:00
about.html	Enhancements to About dialog and add settings button to toolbar	2018-08-20 21:27:37 -04:00
CMakeLists.txt	Replace all .svgz in paths to .svg (#2405)	2018-10-24 08:08:37 -04:00
keepassxc.ini	Add option to not show password placeholder when field is empty (#2333)	2018-09-29 07:44:23 -04:00