aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-05-17 13:36:25 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-05-17 13:36:25 +0200
commit4d2e50224c5b25fa6357a40cb148827c7e8899f2 (patch)
treed4d2bacae657fe83fcd8b0c9670071a924a6ad59
parente34fddd7e1aa26da75b5ad61a4af7504c1db497c (diff)
parentfddb09885715daf744226dd7842b3830b117d3bc (diff)
Merge branch 'master' into development
-rw-r--r--CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 116cc307..f24146ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
###Changelog
+####Version 0.2.2
+* Ability to take photos directly
+* Improved openPGP offline handling
+* Various bug fixes
+* Updated Translations
+
####Version 0.2.1
* Various bug fixes
* Updated Translations