Merge pull request #5420 from benjaoming/develop

0.17.x into develop
learningequality · Mar 16, 2017 · d6bcc1c · d6bcc1c
2 parents 4b68b4c + 44fd3f2
commit d6bcc1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/docs/installguide/release_notes.rst b/docs/installguide/release_notes.rst
@@ -8,6 +8,12 @@ to read the release notes.
   upgrading from ``0.16.x`` to ``0.17.x`` is fine - but upgrading from
   ``0.15.x`` to ``0.17.x`` is not guaranteed to work.
 
+0.18.0 (unreleased)
+-------------------
+
+This version is available as the current ``develop`` branch on Github.
+
+
 0.17.0
 ------
 

diff --git a/docs/kalite.1.gz b/docs/kalite.1.gz