LimeSurvey: develop 4caa8b88
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-05-25 10:22:44 | develop 42d8df4a |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/controllers/admin/questions.php | Diff File | |||
| mod - application/models/TemplateManifest.php | Diff File | |||
| mod - application/third_party/gtranslate-api/GTranslate.php | Diff File | |||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
