LimeSurvey: master b02525a2

Author Committer Branch Timestamp Parent
pstelling pstelling master 2021-07-20 12:17:01 master 3bdf059d
Changeset

Merge branch 'task/zoho-task-themeoptions-topbar'

Conflicts:

application/views/layouts/fullpagebar_view.php

mod - application/controllers/ThemeOptionsController.php Diff File
mod - application/views/layouts/fullpagebar_view.php Diff File
mod - application/views/themeOptions/import_modal.php Diff File
mod - application/views/themeOptions/index.php Diff File