LimeSurvey: cint f1641cb8

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar cint 2016-08-23 14:53:09 cint 676cdb49
Changeset

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

Conflicts:
application/config/version.php
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/extensions/AdminFooter/AdminFooter.php Diff File
mod - application/extensions/AdminFooter/views/footer.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/af/af.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/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/ky/ky.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/th/th.mo Diff File