LimeSurvey: develop f3512fae
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-10-01 15:21 | develop d0a3ba1c |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/views/admin/conditions/includes/form_editconditions_header.php | Diff File | |||
| mod - assets/scripts/admin/conditions.js | Diff File | |||
| mod - docs/release_notes.txt | Diff File | |||
| mod - locale/_template/limesurvey.pot | Diff File | |||
| mod - locale/de-informal/de-informal.mo | Diff File | |||
| mod - locale/zh-Hant-TW/zh-Hant-TW.mo | Diff File | |||
