LimeSurvey: develop fb4cd894

Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-04-19 11:17:00 develop acca5430
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/models/Survey.php

mod - application/core/LSYii_AssetManager.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_integration_panel.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File