Update CHANGELOG with recent merges.

jgarber · Oct 31, 2008 · fff9ea5 · fff9ea5
1 parent 03d3210
commit fff9ea5
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,12 @@
 === Edge
 
-*
+* JRuby support!  [olabini]
+  To run the tests with JRuby, you only need to: jruby -S rake
+  To compile the jruby version of the gem: jruby -S rake compile
+
+* Added textilize ERB utility method. [edraut]
+  Use it in an ERB template like this: <%=t my_textile_string %> or 
+  <%=r %{Some *textile* if you please!} %>
 
 
 === 4.0.4 / October 1, 2008