Merge f433786c61 into cdaefee323

2016-06-30 12:57:03 +00:00 · 2016-06-30 12:57:03 +00:00 · 51fa77c9d5
commit 51fa77c9d5
parent cdaefee323 f433786c61
38 changed files with 676 additions and 33 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@ -41,6 +41,8 @@
 //= require osem-commercials
 //= require unobtrusive_flash
 //= require unobtrusive_flash_bootstrap
+//= require bootstrap-select
+//= require osem-survey

 $(document).ready(function() {
    $('a[disabled=disabled]').click(function(event){