LimeSurvey: 2.06lts 3d21d662

Author Committer Branch Timestamp Parent
DenisChenu DenisChenu 2.06lts 2016-11-16 17:19:44 2.06lts 866d6bcf
Changeset

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

Conflicts:

application/config/version.php

scripts/map.js

mod - .gitignore Diff File
mod - CHANGELOG.md Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/libraries/Date_Time_Converter.php Diff File
mod - docs/release_notes.txt Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/map.js Diff File