summaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2016-12-05 15:21:54 +0100
committerAnne Jan Brouwer <brouwer@annejan.com>2016-12-05 15:21:54 +0100
commitd91849ec309df04c02a9c1f85947e6464dbd61bc (patch)
treea05ca2ecfbd9e32801146ef38a320fe293da1bb3 /CHANGELOG.md
parent11d563a33135dfcc820506e22195082c13a52754 (diff)
Auto updated CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f2f5240..9c0f8279 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Change Log
+## [Unreleased](https://github.com/IJHack/qtpass/tree/HEAD)
+
+[Full Changelog](https://github.com/IJHack/qtpass/compare/v1.1.6...HEAD)
+
+**Merged pull requests:**
+
+- Process management refactoring part 2 [\#249](https://github.com/IJHack/QtPass/pull/249) ([tezeb](https://github.com/tezeb))
+
## [v1.1.6](https://github.com/IJHack/qtpass/tree/v1.1.6) (2016-12-02)
[Full Changelog](https://github.com/IJHack/qtpass/compare/v1.1.5...v1.1.6)