summaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2017-02-24 15:41:25 +0100
committerAnne Jan Brouwer <brouwer@annejan.com>2017-02-24 15:41:25 +0100
commit1ad30e3816b60f5153517bbd59530429487371c6 (patch)
treedf6e4069d9a17faa14f78a2d535e8b580c9962a1 /CHANGELOG.md
parent0dbf86ad041b05f6fd549f056afca3b9744728a7 (diff)
Auto-updated CHANGELOG
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 650a68b1..a1b38218 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
**Merged pull requests:**
+- Fixed path of resources.qrc [\#297](https://github.com/IJHack/QtPass/pull/297) ([sideeffect42](https://github.com/sideeffect42))
- Add pt\_PT translation [\#295](https://github.com/IJHack/QtPass/pull/295) ([keitalbame](https://github.com/keitalbame))
- Update README.md [\#293](https://github.com/IJHack/QtPass/pull/293) ([joostruis](https://github.com/joostruis))
- small band aid fix for password generation on windows [\#276](https://github.com/IJHack/QtPass/pull/276) ([treat1](https://github.com/treat1))