LimeSurvey: develop 28a835ef

Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-06-26 18:20 develop 05227a53
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/helpers/admin/import_helper.php

mod - application/config/version.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - assets/packages/pjax/pjax.js Diff File
mod - docs/release_notes.txt Diff File
add - tests/controllers/ChangeQuestionTemplateTest.php Diff File
add - tests/data/surveys/limesurvey_survey_573386.lss Diff File
mod - themes/survey/vanilla/scripts/ajaxify.js Diff File
mod - themes/survey/vanilla/views/subviews/header/start_form.twig Diff File