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:
Pavel Chipiga 2012-03-02 02:12:11 +02:00
commit e66f0110fc
1 changed files with 0 additions and 5 deletions

View File

@ -1,5 +0,0 @@
$(document).ready(function() {
// SyntaxHighlighter.defaults.toolbar = false;
// SyntaxHighlighter.defaults.gutter = false;
// SyntaxHighlighter.all();
});