Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

parasew · Dec 21, 2018 · 10489a7 · 10489a7
2 parents dd812d9 + 9c2240e
commit 10489a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,6 +5,21 @@ N.B.: You *must* run
 
 after installing the new software, to enjoy the benefits of this new version.
 
+------------------------------------------------------------------------------
+* 0.20.2
+
+New Features:
+
+* Support Ruby 2.4, 2.5
+* MathJax 2.7.5
+* SVG-Edit 4.2.0 
+* Updated Youtube API
+
+Bugs Fixed:
+
+* Trim whitespace from author names
+* Update to Nokogiri 1.8.x (required by Windows)
+
 ------------------------------------------------------------------------------
 * 0.20.1
 

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -298,7 +298,7 @@ module Instiki
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 20
-    TINY  = 1
+    TINY  = 2
     SUFFIX = '(MML+)'
     PRERELEASE = false
     if PRERELEASE