LimeSurvey: develop c46ccd5a

Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-07-04 10:34:49 develop 816ee1f1
Changeset

Merge branch 'master' into develop

mod - application/config/config-defaults.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/themeoptions/index.php Diff File
mod - assets/packages/template-core/template-core.js Diff File