LimeSurvey: master fd523aa0
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | master | 2016-04-14 15:02 | master d1c626ae |
| Changeset | Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey Conflicts: |
|||
| mod - application/helpers/qanda_helper.php | Diff File | |||
| mod - application/views/survey/questions/arrays/multiflexi/rows/cells/answer_td.php | Diff File | |||
| mod - application/views/survey/questions/arrays/multitext/answer.php | Diff File | |||
| mod - application/views/survey/questions/multiplechoice/rows/answer_row_other.php | Diff File | |||
| mod - templates/default/css/template.css | Diff File | |||
