summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2016-09-26 10:18:47 +0200
committerAnne Jan Brouwer <brouwer@annejan.com>2016-09-26 10:18:47 +0200
commit5b3b2e0ce373baba028929787c0399b9bb6c45ba (patch)
tree62b8ee3698eb3bb79d18feb96ea68b2d44f195d9
parent0a0b5e3e49648beb45fb516e77f3d01df2c5d29c (diff)
Updated Changelog
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c2e5466..6472c5ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
- Error after change configuration [\#190](https://github.com/IJHack/qtpass/issues/190)
- Re-assign permissions when adding users [\#161](https://github.com/IJHack/qtpass/issues/161)
+- Character encoding issue with GPG key [\#101](https://github.com/IJHack/qtpass/issues/101)
**Closed issues:**
@@ -22,6 +23,7 @@
**Merged pull requests:**
+- issue 101 bugfix [\#198](https://github.com/IJHack/qtpass/pull/198) ([asalamon74](https://github.com/asalamon74))
- ArchLinux: moved from AUR to \[community\] [\#196](https://github.com/IJHack/qtpass/pull/196) ([eworm-de](https://github.com/eworm-de))
- Czech translation [\#195](https://github.com/IJHack/qtpass/pull/195) ([svetlemodry](https://github.com/svetlemodry))