LimeSurvey: develop 85e3eae5

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz develop 2018-03-21 17:37 develop 3bb6e581
Changeset

Merge branch 'master' into develop
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/views/admin/global_settings/_security.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/themeoptions/update.php Diff File
mod - application/views/admin/update/updater/steps/_check_local_errors.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File
mod - assets/scripts/admin/statistics.js Diff File
mod - themes/survey/bootswatch/options/options.js Diff File
mod - themes/survey/fruity/options/options.js Diff File
mod - themes/survey/vanilla/options/options.js Diff File