Merge branch 'adding_surveys' of https://github.com/mdeniz/osem into mdeniz-adding_surveys

2016-07-01 10:32:07 +02:00 · 2016-07-01 10:32:07 +02:00 · 1991f53f26
commit 1991f53f26
parent 8c27a3dbac 933e14673c
40 changed files with 694 additions and 33 deletions
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@ -14,4 +14,5 @@
 *= require bootstrap-datetimepicker
 *= require leaflet
 *= require bootstrap3-switch
+ *= require bootstrap-select
 */