Merge branch 'master' into feature/gollum-lib

Conflicts: lib/gollum/markup.rb test/test_gitcode.rb
2013-03-20 07:46:11 +00:00
parent cbc0821928 54e144564c
commit b989f160cf
7 changed files with 45 additions and 3 deletions
@@ -43,6 +43,7 @@
  (d.head || d.getElementsByTagName('head')[0]).appendChild(j);
  }(document));
  </script>{{/mathjax}}
+  {{#js}}<script type="text/javascript" src="{{base_url}}/custom.js"></script>{{/js}}

  <title>{{title}}</title>
 </head>