LimeSurvey: 2.06lts b24e0802

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu 2.06lts 2016-09-16 11:02:32 2.06lts a2def0b8
Changeset

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

Conflicts:

application/controllers/admin/tokens.php

application/controllers/survey/index.php

application/models/Token.php
mod - application/core/LSHttpRequest.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - docs/release_notes.txt Diff File