How to merge instructions

2012-02-18 14:43:35 +02:00 · 2012-02-18 14:43:35 +02:00 · fa7bd43ab9
commit fa7bd43ab9
parent 94db8a1c33
7 changed files with 388 additions and 1 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@ -11,6 +11,7 @@
 //= require jquery.tagify
 //= require jquery.cookie
 //= require jquery.endless-scroll
+//= require bootstrap-modal
 //= require modernizr
 //= require chosen
 //= require raphael