summaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2018-01-22 13:55:16 +0100
committerAnne Jan Brouwer <brouwer@annejan.com>2018-01-22 13:55:16 +0100
commit2c7fccaf99a6c1e70944f058060ac5bd29e2680e (patch)
tree15c37b1e50c88e3ce623798fac86fd2d2f836dae /CHANGELOG.md
parent44d1d0ffdf6f57d1e32d5de0ec9d9111dd354efa (diff)
Change dependencies (main depends on src, tests depend on main) fixes #350 als some minor automated housekeeping.
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba8c61f0..fb2159f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
**Merged pull requests:**
+- Fix typo in french translation [\#349](https://github.com/IJHack/QtPass/pull/349) ([babolivier](https://github.com/babolivier))
+- New scroll bar on large files [\#347](https://github.com/IJHack/QtPass/pull/347) ([destanyol](https://github.com/destanyol))
- 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))