LimeSurvey: cint c3e942c5

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar cint 2016-07-25 15:29 cint 2568bdbd
Changeset

Merge branch 'master' into cint

Conflicts:
application/libraries/PluginManager/PluginBase.php
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/views/admin/responses/massive_actions/_selector.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_selector.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/de/de.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/id/id.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 - scripts/admin/subquestions.js Diff File
mod - third_party/jquery-blockui/jquery.blockUI.js Diff File