LimeSurvey: develop 6743dd92

Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2018-11-26 17:52:18 develop 00596cfd
Changeset Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

# Conflicts:
# application/helpers/frontend_helper.php
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/views/admin/assessments/assessments_edit.php Diff File