LimeSurvey: master 58806ca0

Author Committer Branch Timestamp Parent
trischi80 trischi80 master 2021-01-14 11:53:55 master 3050fbbc
Changeset

Merge remote-tracking branch 'origin/develop' into task/zoho-L41-T206-refactor-controller-assessments

Conflicts:

application/config/version.php

application/helpers/update/updatedb_helper.php

mod - application/config/version.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/extensions/TopbarWidget/views/includes/listquestionsTopbarLeft_view.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/Token.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/survey/questions/answer/multiplenumeric/config.xml Diff File
mod - docs/release_notes.txt Diff File