summaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2018-01-02 14:17:29 +0100
committerAnne Jan Brouwer <brouwer@annejan.com>2018-01-02 14:17:29 +0100
commit1bbd1fc9e0ee53a7711be6b5a1608d1aa7ec161e (patch)
tree64be0cfd17c44b236da972fb6497d14595c0bec4 /CHANGELOG.md
parente7bd0651335e1bf4f01512d1555fe0b960ff1787 (diff)
Updated changelog and localization
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a5b4cb2..5cb8ffc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,17 @@
**Closed issues:**
+- Question: is it possible to mass import passes? [\#339](https://github.com/IJHack/QtPass/issues/339)
- Version 1.2.0 leaks passwords [\#334](https://github.com/IJHack/QtPass/issues/334)
- signed release files [\#332](https://github.com/IJHack/QtPass/issues/332)
- 2017 [\#330](https://github.com/IJHack/QtPass/issues/330)
- When importing settings from 1.1.5 or older clipboard settings revert to No Clipboard [\#232](https://github.com/IJHack/QtPass/issues/232)
+**Merged pull requests:**
+
+- Insecure password generation [\#342](https://github.com/IJHack/QtPass/pull/342) ([annejan](https://github.com/annejan))
+- Add Catalan translation [\#336](https://github.com/IJHack/QtPass/pull/336) ([rbuj](https://github.com/rbuj))
+
## [v1.2.0](https://github.com/IJHack/QtPass/tree/v1.2.0) (2017-11-08)
[Full Changelog](https://github.com/IJHack/QtPass/compare/v1.1.6...v1.2.0)