summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-09 06:55:40 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-09 06:55:40 +0100
commit71376a8631a4262793351e3431b3bc2df93b15dd (patch)
treea7b7313268ffc0e98a0f51e15fb2477b00194458 /ChangeLog
parent524a49de17c1c432b0ad6b16f11e64586bf10e7c (diff)
parent7152401783578b56343f578b4ec920998660de33 (diff)
Merge tag 'upstream/0.25.0.1'
Upstream version 0.25.0.1
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
1 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2186070..bee37e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-commit 0a348fe98b77bf17b4cbe8a257eecffc966acbd7
+commit 8cc28654affe568f156bc74a20fb4959160ac872
Author: Jens Georg <mail@jensge.org>
Date: Mon Oct 24 20:09:08 2016 +0200
@@ -9,6 +9,16 @@ Date: Mon Oct 24 20:09:08 2016 +0200
M NEWS
M debian/changelog
+commit cec1eee8af5a79d2091c9b9b6bc26fab0593105d
+Author: Jens Georg <mail@jensge.org>
+Date: Mon Oct 24 21:07:33 2016 +0200
+
+ Distribute SSL ui panel
+
+ Signed-off-by: Jens Georg <mail@jensge.org>
+
+M publish.am
+
commit ece15b26e968e76a9165ba4fdacfcde5a425fc38
Author: Jens Georg <mail@jensge.org>
Date: Sun Oct 16 22:20:14 2016 +0200