LimeSurvey: develop 6f897ac8
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-03-29 13:39 | develop cdd9420a |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | |||
| mod - application/models/TemplateConfig.php | Diff File | |||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
| mod - docs/release_notes.txt | Diff File | |||
| add - themes/survey/vanilla/views/subviews/navigation/clearall_buttons.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/navigator.twig | Diff File | |||
| add - themes/survey/vanilla/views/subviews/navigation/navigator_complement.twig | Diff File | |||
| add - themes/survey/vanilla/views/subviews/navigation/question_index_buttons.twig | Diff File | |||
| add - themes/survey/vanilla/views/subviews/navigation/question_index_groups_buttons.twig | Diff File | |||
| add - themes/survey/vanilla/views/subviews/navigation/question_index_questions_buttons.twig | Diff File | |||
| add - themes/survey/vanilla/views/subviews/navigation/save_buttons.twig | Diff File | |||
