LimeSurvey: cint 23795f9f

Author Committer Branch Timestamp Parent
ollehar ollehar cint 2016-08-19 11:06:41 cint 44821052
Changeset

Merge remote-tracking branch 'origin/master' into cint

Conflicts:
application/helpers/admin/activate_helper.php

mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/views/admin/survey/QuestionGroups/group_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_accordion_container.php Diff File
add - application/views/admin/survey/subview/tabPluginSettings_view.php Diff File