LimeSurvey: develop 13a7e73c
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-03-23 11:17:38 | develop 4552ee3e |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/controllers/admin/themes.php | Diff File | |||
| mod - application/core/LS_Twig_Extension.php | Diff File | |||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/helpers/export_helper.php | Diff File | |||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | |||
| mod - application/helpers/replacements_helper.php | Diff File | |||
| mod - application/libraries/admin/quexmlpdf.php | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/survey/question_container.twig | Diff File | |||
