LimeSurvey: 2.1 20ac7220

Diff Back to Repository
Author Committer Branch Timestamp Parent
user16774 user16774 2.1 2012-08-03 14:55 2.1 09a79e2e
Changeset

Merge branch 'Yii' of github.com:LimeSurvey/LimeSurvey into Question_Objects

Conflicts:
application/config/version.php
application/helpers/qanda_helper.php
mod - application/config/version.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - docs/release_notes.txt Diff File