LimeSurvey: develop 27d7aea3

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2017-02-01 10:37:28 develop a545d759
Changeset

Merge remote-tracking branch 'origin/master' into develop

Conflicts:
application/config/version.php
docs/release_notes.txt
mod - application/config/version.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/models/Condition.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/cs/cs.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/sl/sl.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File