LimeSurvey: develop caf06521

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2018-10-08 15:02 develop 40d6525a
Changeset

Merge branch 'master' into develop

Conflicts:

application/config/version.php

application/models/QuestionAttribute.php

application/models/behaviors/PluginEventBehavior.php
mod - application/config/version.php Diff File
mod - application/models/Dynamic.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/Timing.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/behaviors/PluginEventBehavior.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/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/gl/gl.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/nb/nb.mo Diff File