LimeSurvey: develop 29178633
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-05-30 19:52 | develop 589cf5f6 |
| Changeset | Merge branch 'develop' of https://github.com/LimeSurvey/LimeSurvey into develop Conflicts: |
|||
| 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 | |||
