LimeSurvey: cint f08d0766

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar cint 2016-08-01 08:43:46 cint a892e876
Changeset

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

Conflicts:
application/libraries/PluginManager/LimesurveyApi.php
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
add - application/helpers/questionHelper.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - index.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de-informal/de-informal.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/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