LimeSurvey: 2.05 1bf48a4d

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.05 2013-03-26 19:03 2.05 c0e4712e
Changeset

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

Conflicts:
application/controllers/InstallerController.php
mod - application/config/internal.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/models/Failed_login_attempts.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/plugins/index.php Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File
mod - plugins/ShowResponse/ShowResponse.php Diff File