LimeSurvey: 2.05 8a5dcda6

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.05 2013-09-17 10:55 2.05 0f17969a
Changeset

Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05

Conflicts:
application/models/Dynamic2.php
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/Participant.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File