Janek Bevendorff b2fd7f6d54 Merge branch 'master' into develop		2020-01-19 21:44:25 +01:00
..
docs	CLI: Fix keyfile from/to parameter collision in merge command	2019-12-21 17:39:50 -05:00
icons	Replace application icons with Material Design icons.	2020-01-11 19:00:15 +01:00
linux	Update CHANGELOG	2020-01-19 21:42:00 +01:00
macosx	Fix release-tool on macOS and add notarization. (#3827)	2019-11-10 00:08:20 +01:00
translations	Update translations	2020-01-19 21:43:15 +01:00
windows	Correct application shortcut created by MSI Installer (#3296)	2019-06-29 18:34:19 -04: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
CMakeLists.txt	Add links to docs in the Help menu (#3274)	2019-06-18 20:46:46 -04:00
crushpng.sh	Icon cleanup	2019-02-05 16:09:17 -05:00
demo.kdbx	Add demo kdbx file (password is secret) (#3294)	2019-06-30 11:07:59 -04:00
demo.key	Add demo kdbx file (password is secret) (#3294)	2019-06-30 11:07:59 -04:00
keepassxc.ini	Only use bare minimum settings for portable version	2020-01-09 14:21:02 +01:00