LimeSurvey: develop 249d5ceb

Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-05-17 14:03:00 develop 3fbd9495
Changeset

Merge branch 'master' into develop

mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_ajax_variables.php Diff File
mod - assets/scripts/admin/questions.js Diff File