LimeSurvey: develop 695a7b64

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2016-12-14 10:54 develop 9c7012d2
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Dev: F start merge conflicts ...
Dev: F all this bug are already fixed in 3.0

Conflicts:

application/controllers/survey/index.php

application/helpers/qanda_helper.php

application/helpers/replacements_helper.php

application/libraries/Load_answers.php

application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php
mod - application/commands/console.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/update/_ajaxVariables.php Diff File
mod - scripts/admin/participantpanel.js Diff File