LimeSurvey: develop 66633c7f
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-05-24 10:33:35 | develop 870feac0 |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | |||
| mod - application/models/QuestionTemplate.php | Diff File | |||
| mod - application/views/admin/assessments/assessments_edit.php | Diff File | |||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
| mod - assets/scripts/admin/questions.js | Diff File | |||
| add - themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/bootstrap_buttons_listradio.png | Diff File | |||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/config.xml | Diff File | |||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig | Diff File | |||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/answer.twig | Diff File | |||
| add - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/bootstrap_buttons_multiplechoice.png | Diff File | |||
| mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml | Diff File | |||
