LimeSurvey: master fb9d61c1

Author Committer Branch Timestamp Parent
twilllig twilllig master 2024-01-16 17:38 master 21025123
Changeset

Merge remote-tracking branch 'origin/master' into develop

Conflicts:

application/config/version.php

mod - application/config/version.php Diff File
mod - application/controllers/admin/CheckIntegrity.php Diff File
mod - application/controllers/admin/ParticipantsAction.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
add - application/helpers/update/updates/Update_621.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/SurveyActivator.php Diff File
mod - application/models/services/SurveyAggregateService/GeneralSettings.php Diff File
mod - application/views/surveyAdministration/surveyActivation/_activation_error.php Diff File
mod - installer/create-database.php Diff File