LimeSurvey: develop 7aa7d46a

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-09-25 13:47:54 develop 31656d8c
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/views/admin/survey/Question/question_view.php
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - docs/release_notes.txt Diff File