LimeSurvey: develop b2703455

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2018-10-23 11:03:47 develop 762602ca
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

Conflicts:

application/controllers/admin/questions.php

application/core/Survey_Common_Action.php

application/helpers/expressions/em_manager_helper.php

application/helpers/questionHelper.php
mod - application/controllers/admin/database.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/helpers/admin/export/HtmlWriter.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/survey/questions/answer/arrays/dualscale/answer.twig Diff File