LimeSurvey: answers_html-mergedMaster fd6532d3

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html-mergedMaster 2016-10-12 14:39:38 answers_html-mergedMaster 35fd06eb
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html-mergedMaster
Dev: keep gender already fixed. Must review star (but wait if it's included in 2.5 or not)

Conflicts:

application/views/survey/questions/gender/buttons/answer.php

application/views/survey/questions/gender/radio/answer.php
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - scripts/star-rating.js Diff File
mod - styles-public/star-rating.css Diff File