LimeSurvey: 2.1 a7ff8b77

Diff Back to Repository
Author Committer Branch Timestamp Parent
mdekker mdekker 2.1 2012-12-20 12:28 2.1 3264e657
Changeset

Merge branch '2.1' of https://github.com/LimeSurvey/LimeSurvey into 2.1

Conflicts resolved using mine:
admin/admin.php
admin/index.php
mod - .gitattributes Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/modules/ArrayQuestion.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/ColumnRadioArrayQuestion.php Diff File
mod - application/modules/CommentCheckQuestion.php Diff File
mod - application/modules/CommentListQuestion.php Diff File
mod - application/modules/DualRadioArrayQuestion.php Diff File
mod - application/modules/FiveListQuestion.php Diff File
mod - application/modules/FiveRadioArrayQuestion.php Diff File
mod - application/modules/HugeTextQuestion.php Diff File
mod - application/modules/IDRadioArrayQuestion.php Diff File
mod - application/modules/ListQuestion.php Diff File
mod - application/modules/MultitextQuestion.php Diff File
mod - application/modules/NumberArrayQuestion.php Diff File
mod - application/modules/QuestionModule.php Diff File
mod - application/modules/RadioArrayQuestion.php Diff File
mod - application/modules/TenRadioArrayQuestion.php Diff File
mod - application/modules/TextArrayQuestion.php Diff File
mod - application/modules/TextQuestion.php Diff File
mod - application/modules/YNRadioArrayQuestion.php Diff File
mod - application/views/admin/export/statistics_browse_view.php Diff File