LimeSurvey: develop 816ee1f1

Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-06-29 17:11:14 develop 615004a1
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php

mod - .travis.yml Diff File
mod - application/config/version.php Diff File
mod - application/core/LSYii_ImageValidator.php Diff File
mod - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.dist.js Diff File
mod - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.js Diff File
mod - application/helpers/SurveyRuntimeHelper.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/eu/eu.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - tests/data/travis/travis_setup.sh Diff File