LimeSurvey: develop 63c04a31

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2016-12-07 12:47 develop e49aaf89
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Dev: not tested merge of frontend_helper
Dev: qanda seems OK

Conflicts:

application/helpers/frontend_helper.php

application/helpers/qanda_helper.php
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/admin/export/generatestats/simplestats/_statisticsoutput_graphs.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File