LimeSurvey: master 049a1eb9

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar master 2017-06-16 12:47:30 master 3af73faa
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

Conflicts:
application/helpers/qanda_helper.php
mod - application/config/version.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/listradio/rows/answer_row.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/fr/fr.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 - locale/tr/tr.mo Diff File