LimeSurvey: develop 42d8df4a
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-05-24 18:16 | develop 66633c7f |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/controllers/admin/questions.php | Diff File | |||
| mod - application/helpers/admin/statistics_helper.php | Diff File | |||
| mod - application/helpers/questionHelper.php | Diff File | |||
| mod - application/helpers/userstatistics_helper.php | Diff File | |||
| mod - application/models/QuestionTemplate.php | Diff File | |||
| mod - application/views/admin/export/generatestats/_statisticsoutput_header.php | Diff File | |||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
| mod - docs/release_notes.txt | Diff File | |||
| mod - locale/_template/limesurvey.pot | Diff File | |||
| mod - locale/ca/ca.mo | Diff File | |||
| mod - locale/hu/hu.mo | Diff File | |||
| mod - locale/ja/ja.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 - tests/TestHelper.php | Diff File | |||
