Merge 03168b4efe into cdaefee323

2016-06-30 10:43:49 +00:00 · 2016-06-30 10:43:49 +00:00 · fdec9fe035
commit fdec9fe035
parent cdaefee323 03168b4efe
31 changed files with 603 additions and 23 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){