LimeSurvey: develop b4a0b4ca

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2016-11-11 12:33:26 develop 1888b37c
Changeset

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

Conflicts:

application/config/version.php
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/pluginmanager.php Diff File
mod - application/views/admin/pluginmanager/index.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/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/sv/sv.mo Diff File