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 per-page-uploads

Browse Source 
Conflicts:
	lib/gollum/public/gollum/javascript/gollum.js
This commit is contained in:
Matt Palmer
2014-01-03 17:49:53 +11:00
parent 5eac24eacb 3fd16daeca
commit d1fb98cf1b
7 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/templates/layout.mustache
+1
View File
@@ -7,6 +7,7 @@
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/dialog.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/template.css" media="all">
{{#css}}<link rel="stylesheet" type="text/css" href="{{base_url}}/custom.css" media="all">{{/css}}
{{#noindex}}<meta name="robots" content="noindex, nofollow" />{{/noindex}}
<!--[if IE 7]>
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/ie7.css" media="all">