LimeSurvey: develop 35f71469

Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-05-25 11:00:26 develop 4caa8b88
Changeset

Dev: Clean up merge problems

mod - application/controllers/admin/questions.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File