LimeSurvey: 2.1 b995dfd9

Author Committer Branch Timestamp Parent
sammousa sammousa 2.1 2012-11-27 17:43:58 2.1 3d0b87ab
Changeset

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

mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/token/csvupload.php Diff File