Merge 933e14673c into 8c27a3dbac

2016-06-30 15:39:29 +00:00 · 2016-06-30 15:39:29 +00:00 · 96ae730955
commit 96ae730955
parent 8c27a3dbac 933e14673c
40 changed files with 694 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){