LimeSurvey: answers_html 71ae6622

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html 2016-11-05 15:38 answers_html b36b50aa
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html
Dev: ... merge before update function

Conflicts:

application/config/version.php

application/controllers/admin/database.php
mod - application/config/version.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/views/admin/survey/Question/yesNo_defaultvalue_widget.php Diff File
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - scripts/admin/questiongroup.js Diff File