LimeSurvey: develop 79958cd2

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2016-12-02 19:09:25 develop 2ad7bb1c
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

Conflicts:

application/config/version.php
mod - application/config/version.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/views/admin/global_settings/_general.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ar/ar.mo 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/fi/fi.mo Diff File
mod - locale/gu/gu.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/id/id.mo Diff File
mod - locale/ky/ky.mo Diff File
mod - locale/ms/ms.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/prs/prs.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/th/th.mo Diff File