summaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2018-01-15 16:07:58 +0100
committerAnne Jan Brouwer <brouwer@annejan.com>2018-01-15 16:07:58 +0100
commitc735ba5de28dcc75eb811f43b87edd52eebaac30 (patch)
treee7310228b5cbad06a08d014715054376a021c6c4 /CHANGELOG.md
parentaffce86cff8bb8853703487c6417056dcf08b0c0 (diff)
Auto updated translations etc . .
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a3491b0..ba8c61f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,11 @@
- Insecure Password Generation [\#338](https://github.com/IJHack/QtPass/issues/338)
+**Merged pull requests:**
+
+- Fix nested template argument list compile error [\#346](https://github.com/IJHack/QtPass/pull/346) ([martinburchell](https://github.com/martinburchell))
+- Honor PREFIX during tests install [\#345](https://github.com/IJHack/QtPass/pull/345) ([SpiderX](https://github.com/SpiderX))
+
## [v1.2.1](https://github.com/IJHack/QtPass/tree/v1.2.1) (2018-01-04)
[Full Changelog](https://github.com/IJHack/QtPass/compare/v1.2.0...v1.2.1)