LimeSurvey: develop 0f77c178

Diff Back to Repository
Author Committer Branch Timestamp Parent
markusfluer markusfluer develop 2017-01-30 17:13:02 develop 3dcabd6d
Changeset

Dev: Merge branch 'master' into develop

Conflicts:

application/config/version.php

application/controllers/admin/questions.php

scripts/star-rating.js
mod - application/config/version.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.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/fr/fr.mo Diff File
mod - locale/hu/hu.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 - plugins/AuditLog/AuditLog.php Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/star-rating.js Diff File