wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into toc

Browse Source 
Conflicts:
	lib/gollum/frontend/app.rb
	lib/gollum/markup.rb
	test/test_markup.rb
This commit is contained in:
kristi
2012-05-14 09:12:44 -07:00
parent 6191f60025 20389babbc
commit d7f4eeea2c
92 changed files with 8356 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum.rb
+1 -1
View File
@@ -22,7 +22,7 @@ require File.expand_path('../gollum/tex', __FILE__)
require File.expand_path('../gollum/web_sequence_diagram', __FILE__)
module Gollum
VERSION = '2.0.0'
VERSION = '2.1.0'
def self.assets_path
::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))