LimeSurvey: master 97396bbd

Author Committer Branch Timestamp Parent
pstelling pstelling master 2020-03-26 08:39:04 master 6b71d704
Changeset

Merge branch 'master' into bug/OP-674-anonymize-ip-adress

Conflicts:

application/config/version.php

mod - application/config/version.php Diff File
mod - application/controllers/admin/LimeSurveyFileManager.php Diff File
mod - assets/packages/adminsidepanel/build.min/js/adminsidepanel.js Diff File
mod - assets/packages/adminsidepanel/build.min/js/adminsidepanel.js.map Diff File
mod - assets/packages/adminsidepanel/build/js/adminsidepanel.js Diff File
mod - assets/packages/adminsidepanel/src/adminsidepanelmain.js Diff File
mod - assets/packages/admintoppanel/build.min/js/admintoppanel.js Diff File
mod - assets/packages/admintoppanel/build/js/admintoppanel.js Diff File
mod - assets/packages/admintoppanel/build/js/admintoppanel.js.map Diff File
mod - assets/packages/admintoppanel/src/admintoppanelmain.js Diff File
mod - assets/packages/filemanager/build.min/css/main.css Diff File
mod - assets/packages/filemanager/build.min/js/filemanager.js Diff File
mod - assets/packages/filemanager/build.min/js/filemanager.js.map Diff File
mod - assets/packages/filemanager/build/js/filemanager.js Diff File
mod - assets/packages/filemanager/src/components/subcomponents/_treeView.vue Diff File
mod - assets/packages/filemanager/src/filemanagermain.js Diff File
mod - assets/packages/filemanager/src/storage/actions.js Diff File
mod - assets/packages/filemanager/src/storage/state.js Diff File
mod - assets/packages/filemanager/yarn.lock Diff File
mod - docs/release_notes.txt Diff File