LimeSurvey: develop f695705a

Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2018-10-04 16:47:26 develop 73fab68f
Changeset

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

Conflicts:

application/helpers/qanda_helper.php

mod - application/helpers/qanda_helper.php Diff File
mod - application/views/admin/assessments/assessments_edit.php Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig Diff File
add - themes/survey/fruity/files/favicon.ico Diff File