LimeSurvey: develop 0d6060d7
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-06-05 18:14 | develop e6182d1e |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/controllers/admin/themes.php | Diff File | |||
| mod - application/core/LSETwigViewRenderer.php | Diff File | |||
| mod - application/core/LsDefaultDataSets.php | Diff File | |||
| mod - application/helpers/common_helper.php | Diff File | |||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | |||
| mod - application/models/TemplateConfiguration.php | Diff File | |||
| mod - themes/survey/vanilla/config.xml | Diff File | |||
| mod - themes/survey/vanilla/scripts/ajaxify.js | Diff File | |||
| mod - themes/survey/vanilla/views/layout_errors.twig | Diff File | |||
| mod - themes/survey/vanilla/views/layout_global.twig | Diff File | |||
| mod - themes/survey/vanilla/views/layout_survey_list.twig | Diff File | |||
| add - themes/survey/vanilla/views/subviews/footer/footer.twig | Diff File | |||
