Merge branch 'master' of github.com:Nerian/bootstrap-wysihtml5-rails

Nerian · Nerian · commit 0769968bd4e8 · 2014-04-21T23:57:22.000+02:00
diff --git a/vendor/assets/javascripts/bootstrap-wysihtml5/core-b3.js.erb b/vendor/assets/javascripts/bootstrap-wysihtml5/core-b3.js.erb
@@ -1,3 +1,5 @@
+//= depend_on_asset "bootstrap-wysihtml5/wysiwyg-color.css"
+
 !function($, wysi) {
     "use strict";
 
diff --git a/vendor/assets/javascripts/bootstrap-wysihtml5/core.js.erb b/vendor/assets/javascripts/bootstrap-wysihtml5/core.js.erb
@@ -1,3 +1,5 @@
+//= depend_on_asset "bootstrap-wysihtml5/wysiwyg-color.css"
+
 !function($, wysi) {
     "use strict";
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//= depend_on_asset "bootstrap-wysihtml5/wysiwyg-color.css"`
	`2`	`+`
`1`	`3`	`!function($, wysi) {`
`2`	`4`	`"use strict";`
`3`	`5`