LimeSurvey: 2.1 b8a1eca1

Diff Back to Repository
Author Committer Branch Timestamp Parent
user16774 user16774 2.1 2012-09-03 18:48 2.1 8cc0041f
Changeset

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

Conflicts:
application/controllers/admin/statistics.php
application/helpers/admin/statistics_helper.php
installer/sql/create-mssql.sql
installer/sql/create-mysql.sql
installer/sql/create-pgsql.sql
mod - application/config/version.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Question_attributes.php Diff File
mod - application/views/admin/export/statistics_view.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