summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-03-22 18:39:32 +0000
committerCarl Hetherington <cth@carlh.net>2018-03-22 20:30:40 +0000
commit6ddc8b0a1bbbb434afce60c282f6773132952621 (patch)
tree4e8264059e7fdaf7f92935753410d83e030e65b1 /ChangeLog
parentc140d6ed0ce518db6b5a676ed9ef4a21e5eb4f03 (diff)
Merge Carsten's de_DE translation from c52231e.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog18
1 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e2da549d1..da3701f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,22 @@
-<<<<<<< HEAD
-2018-03-14 Carl Hetherington <cth@carlh.net>
-=======
+2018-03-22 Carl Hetherington <cth@carlh.net>
+
+ * Updated de_DE translation from Carsten Kurz.
+
+ * Version 2.12.1 released.
+
+2018-03-22 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.0 released.
+
+2018-03-22 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.79 released.
+
2018-03-21 Carl Hetherington <cth@carlh.net>
* Updated nl_NL translation from Rob van Nieuwkerk.
2018-03-19 Carl Hetherington <cth@carlh.net>
->>>>>>> 15f3ff4... Updated nl_NL translation from Rob van Nieuwkerk.
* Better error when loading a non-certificate as a certificate.