summaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2018-04-26 12:54:07 +0200
committerAnne Jan Brouwer <brouwer@annejan.com>2018-04-26 12:54:07 +0200
commitb7c624956ef1d12ff004522f349e96090d5f2e5f (patch)
tree9ee90f420c2bb090693006605b2522523afdb417 /CHANGELOG.md
parenta9422bafa07f57da8afa73c9359cd2ffc362b23c (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 2e3de550..ea1f209e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
**Merged pull requests:**
+- Sorry for last error :\) [\#370](https://github.com/IJHack/QtPass/pull/370) ([FiloSpaTeam](https://github.com/FiloSpaTeam))
- Optimizations :\) [\#367](https://github.com/IJHack/QtPass/pull/367) ([FiloSpaTeam](https://github.com/FiloSpaTeam))
- Removed comment out \#includes [\#365](https://github.com/IJHack/QtPass/pull/365) ([FiloSpaTeam](https://github.com/FiloSpaTeam))
- fix for \#300 [\#363](https://github.com/IJHack/QtPass/pull/363) ([FiloSpaTeam](https://github.com/FiloSpaTeam))