LimeSurvey: develop 68d124fd

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2016-12-10 14:16:12 develop e489c785
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Dev: revert https://github.com/LimeSurvey/LimeSurvey/commit/9b2202872d169ec6b55b56cf72cab1b3217ccb8f
Dev: see https://github.com/LimeSurvey/LimeSurvey/pull/611

Conflicts:

application/helpers/expressions/em_manager_helper.php
mod - application/core/LSYii_Controller.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File