Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts: app/assets/javascripts/extra/syntax.highlighter-init.js app/assets/stylesheets/design/common.scss vendor/assets/stylesheets/vendor.scss
This commit is contained in:
commit
e66f0110fc
|
@ -1,5 +0,0 @@
|
|||
$(document).ready(function() {
|
||||
// SyntaxHighlighter.defaults.toolbar = false;
|
||||
// SyntaxHighlighter.defaults.gutter = false;
|
||||
// SyntaxHighlighter.all();
|
||||
});
|
Loading…
Reference in New Issue