Browse files

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

  • Loading branch information...
2 parents 17e6732 + 977f13f commit e96665e3d59b38a28d9bfd06c9a0cb9166eb9664 @distler distler committed Feb 7, 2013
Showing with 11 additions and 1 deletion.
  1. +10 −0 CHANGELOG
  2. +1 −1 app/controllers/application_controller.rb
View
10 CHANGELOG
@@ -6,6 +6,16 @@ N.B.: You *must* run
after installing the new software, to enjoy the benefits of this new version.
------------------------------------------------------------------------------
+* 0.19.6
+
+New Features:
+* SVG-Edit 1.6
+* Rails 2.3.16
+
+Bugs Fixed:
+* Fixed CVE-2013-0333
+
+------------------------------------------------------------------------------
* 0.19.5
New Features:
View
2 app/controllers/application_controller.rb
@@ -286,7 +286,7 @@ module Instiki
module VERSION #:nodoc:
MAJOR = 0
MINOR = 19
- TINY = 5
+ TINY = 6
SUFFIX = '(MML+)'
PRERELEASE = false
if PRERELEASE

0 comments on commit e96665e

Please sign in to comment.