LimeSurvey: develop dd2b5ada

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-06-06 16:31:23 develop b68f1d02
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/helpers/update/updatedb_helper.php
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File