branching: merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 17 Nov 2017 00:49:09 +0100
changeset 3200 c78c3d2283c6
parent 3198 390c87f8c65d (current diff)
parent 3199 f33768dd2422 (diff)
child 3201 6f0ae6943351
branching: merge with stable
--- a/CHANGELOG	Thu Nov 16 11:38:33 2017 -0800
+++ b/CHANGELOG	Fri Nov 17 00:49:09 2017 +0100
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-7.0.1 - in progress
+7.0.1 -- 2017-11-14
 -------------------
 
   * obsdiscovery: allow the config option to disable discovery server side