Merge 9379586fad into 4089f16f17

2017-01-31 09:32:01 +00:00 · 2017-01-31 09:32:01 +00:00 · 0e6630c40f
commit 0e6630c40f
parent 4089f16f17 9379586fad
6 changed files with 3 additions and 165 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@ -18,7 +18,6 @@
 //= require waypoints/jquery.waypoints
 //= require dataTables/jquery.dataTables
 //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
-//= require cocoon
 //= require bootstrap
 //= require Chart
 //= require osem