Merge branch 'master' into base-url

Conflicts:
	lib/gollum/frontend/public/gollum/css/_styles.css
	lib/gollum/frontend/public/gollum/javascript/gollum.js
	lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js
	lib/gollum/frontend/templates/file_view.mustache
	lib/gollum/frontend/templates/layout.mustache
	lib/gollum/frontend/templates/page.mustache
This commit is contained in:
Sunny Ripert
2012-07-25 10:00:52 +02:00
119 changed files with 1324 additions and 11613 deletions
@@ -88,7 +88,7 @@
</div>
</div>
<textarea id="gollum-editor-body"
data-markup-lang="{{format}}" name="content">{{content}}</textarea>
data-markup-lang="{{format}}" name="content" class="mousetrap">{{content}}</textarea>
{{#header}}
<div id="gollum-editor-edit-header" class="collapsed">