LimeSurvey: develop 31a9650c

Author Committer Branch Timestamp Parent
Dominik Vitt Dominik Vitt develop 2018-05-30 17:24:13 develop 9615c081
Changeset

Dev: Fix some merge problems related to L10n

mod - application/controllers/admin/questions.php Diff File
mod - application/models/Answer.php Diff File
mod - application/views/admin/survey/Question/answerOptionsEdit_view.twig Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File