LimeSurvey: develop ba0d9d1a

Author Committer Branch Timestamp Parent
sammousa sammousa develop 2015-07-24 15:01:11 develop d9417456
Changeset

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

mod - application/controllers/admin/authentication.php Diff File
mod - application/core/db/SmartColumnTypeTrait.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/ranking.js Diff File
mod - scripts/survey_runtime.js Diff File