LimeSurvey: 2.5 e5585957

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.5 2015-12-15 14:03:32 2.5 75032c23
Changeset

Merge branch 'master' into 2.5

Conflicts:

application/helpers/admin/token_helper.php
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/views/admin/htmleditor/pop_nofields_view.php Diff File
mod - docs/demosurveys/ls205_sample_survey_multilingual.lss 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/fi/fi.mo Diff File
mod - locale/th/th.mo Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/map.js Diff File