LimeSurvey: rand 9d27351c

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar rand 2016-09-01 10:26 rand 503c976c
Changeset

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

Conflicts:
application/helpers/frontend_helper.php
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/views/admin/update/updater/_error.php Diff File
mod - application/views/admin/update/updater/welcome/_error.php Diff File
mod - application/views/admin/update/updater/welcome/_welcome.php Diff File
mod - locale/_template/limesurvey.pot 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/id/id.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/ky/ky.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 - templates/default/css/template.css Diff File
mod - templates/default/views/survey.pstpl Diff File
mod - templates/default/views/surveylist.pstpl Diff File
mod - templates/news_paper/css/template.css Diff File
mod - templates/news_paper/views/survey.pstpl Diff File
mod - templates/news_paper/views/surveylist.pstpl Diff File
mod - templates/ubuntu_orange/css/template.css Diff File
mod - templates/ubuntu_orange/views/survey.pstpl Diff File
mod - templates/ubuntu_orange/views/surveylist.pstpl Diff File