Merge branch 'release/2.2.2' into develop

This commit is contained in:
Janek Bevendorff 2017-10-20 23:08:04 +02:00
commit f634f20ccc
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
2 changed files with 9 additions and 4 deletions

View file

@ -18,8 +18,8 @@ KeePass Cross-platform Community Edition
- Password strength meter
- Using website favicons as entry icons
- Merging of databases
- Automatic reload when the database was changed externally
- KeePassHTTP support for use with [PassIFox](https://addons.mozilla.org/en-us/firefox/addon/passifox/) in Mozilla Firefox, [chromeIPass](https://chrome.google.com/webstore/detail/chromeipass/ompiailgknfdndiefoaoiligalphfdae) in Google Chrome or Chromium and [passafari](https://github.com/mmichaa/passafari.safariextension/) in Safari.
- Automatic reload when the database changed on disk
- KeePassHTTP support for use with KeePassHTTP-Connector for [Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepasshttp-connector/) and [Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepasshttp-connector/dafgdjggglmmknipkhngniifhplpcldb), and [passafari](https://github.com/mmichaa/passafari.safariextension/) in Safari.
- Many bug fixes
For a full list of features and changes, read the [CHANGELOG](CHANGELOG) document.