Merge pull request #612 from schneikai/bootstrap-js-fix

Importing bootstrap-sprockets is all we need.
comfy · Mar 5, 2015 · 886b227 · 886b227
2 parents b885e6b + a843be5
commit 886b227
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/app/assets/javascripts/comfy/admin/cms/application.js.coffee b/app/assets/javascripts/comfy/admin/cms/application.js.coffee
@@ -9,7 +9,6 @@
 #= require codemirror/modes/xml
 #= require codemirror/addons/edit/closetag
 #= require bootstrap-sprockets
-#= require bootstrap
 #= require comfy/admin/cms/lib/bootstrap-datetimepicker
 #= require comfy/admin/cms/lib/diff
 #= require comfy/admin/cms/lib/redactor