LimeSurvey: 2.05 c2d03e6f

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.05 2013-03-20 15:37 2.05 e0689feb
Changeset

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

Conflicts:
application/controllers/admin/surveypermission.php
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File