LimeSurvey: develop e4074444

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2016-12-06 11:06 develop fbf2ff1a
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Dev: leave bug for another commit

Conflicts:

application/config/version.php

application/controllers/admin/database.php
mod - application/config/version.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/Session.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/es/es.mo Diff File
mod - locale/ky/ky.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File
rm - scripts/admin/sharePanel.js Diff
mod - scripts/admin/statistics.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/survey_runtime.js Diff File