LimeSurvey: 2.06lts 0697d574

Author Committer Branch Timestamp Parent
DenisChenu DenisChenu 2.06lts 2017-03-02 16:42:36 2.06lts 7f6b80c3
Changeset

Merge branch '2.06lts' of https://github.com/LimeSurvey/LimeSurvey.git into 2.06_SondagesPro

Conflicts:

application/config/version.php

application/helpers/common_helper.php

mod - CHANGELOG.md Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - docs/release_notes.txt Diff File