LimeSurvey: develop a7f12216
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
ollehar | ollehar | develop | 2018-05-29 15:52 | develop 7243b0cb |
Changeset | Merge branch 'master' into develop Conflicts: |
|||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | |||
mod - application/helpers/replacements_helper.php | Diff File | |||
mod - application/helpers/update/updatedb_helper.php | Diff File | |||
mod - assets/packages/expressions/em_javascript.js | Diff File | |||
mod - assets/packages/limesurvey/survey.js | Diff File | |||
add - tests/data/surveys/limesurvey_survey_351443.lss | Diff File | |||
add - tests/surveys/AutoCalcTest.php | Diff File | |||
mod - themes/survey/vanilla/scripts/theme.js | Diff File | |||
mod - themes/survey/vanilla/views/subviews/survey/question_subviews/survey_question_help.twig | Diff File |