LimeSurvey: develop 45e61433
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-05-29 16:58:05 | develop 91fc8aeb |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/config/internal.php | Diff File | |||
| mod - application/controllers/admin/questiongroups.php | Diff File | |||
| mod - application/controllers/admin/questions.php | Diff File | |||
| mod - application/core/LSETwigViewRenderer.php | Diff File | |||
| mod - application/views/admin/responses/browsemenubar_view.php | Diff File | |||
| add - application/views/admin/survey/Question/answerOptionsEdit_view.twig | Diff File | |||
| mod - application/views/admin/survey/Question/answerOptions_view.php | Diff File | |||
| rm - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.php | Diff File | |||
| add - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.twig | Diff File | |||
| rm - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.php | Diff File | |||
| add - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.twig | Diff File | |||
| mod - locale/_template/limesurvey.pot | Diff File | |||
| mod - locale/ca/ca.mo | Diff File | |||
| mod - locale/es-AR/es-AR.mo | Diff File | |||
| mod - locale/fr/fr.mo | Diff File | |||
| mod - locale/hr/hr.mo | Diff File | |||
| mod - locale/hu/hu.mo | Diff File | |||
| mod - locale/it-informal/it-informal.mo | Diff File | |||
| mod - locale/it/it.mo | Diff File | |||
| mod - locale/nb/nb.mo | Diff File | |||
| mod - locale/nl-informal/nl-informal.mo | Diff File | |||
| mod - locale/nl/nl.mo | Diff File | |||
| mod - locale/pl/pl.mo | Diff File | |||
| mod - locale/ru/ru.mo | Diff File | |||
