LimeSurvey: develop 77cf0912

Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-09-24 15:47:20 develop f7fe78e4
Changeset

Merge branch 'master' into develop

Conflicts:
application/views/admin/survey/breadcrumb.php

mod - application/models/QuotaLanguageSetting.php Diff File
mod - application/models/SurveyLanguageSetting.php Diff File
mod - application/views/admin/survey/breadcrumb.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/de-informal/de-informal.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/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ro/ro.mo Diff File