summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2017-10-24 10:41:25 +0200
committerAnne Jan Brouwer <brouwer@annejan.com>2017-10-24 10:41:25 +0200
commit8b687546f37f7aaa60801b710ce9a74461b61064 (patch)
tree647c3cf72faf6f2489c4f96df2215e399216d27a
parent6e1b6522c3651e7b6dd71aa37967d16eafdf260c (diff)
CHANGELOG updated
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf49c53c..b11e9b7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
**Merged pull requests:**
+- Extract static library and separate main function [\#324](https://github.com/IJHack/QtPass/pull/324) ([tezeb](https://github.com/tezeb))
- galego actualizado [\#323](https://github.com/IJHack/QtPass/pull/323) ([xmgz](https://github.com/xmgz))
- Add sftp, ftps, webdav and webdavs as supported links [\#322](https://github.com/IJHack/QtPass/pull/322) ([cgonzalez](https://github.com/cgonzalez))
- Ignore cmdline arguments if -session is used. [\#321](https://github.com/IJHack/QtPass/pull/321) ([Achimh3011](https://github.com/Achimh3011))