LimeSurvey: questionobject_prototype1 d7119c06

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar1 ollehar1 questionobject_prototype1 2016-10-06 21:55 questionobject_prototype1 58361a0f
Changeset

Merge remote-tracking branch 'origin/master' into questionobject_prototype1

Conflicts:
application/models/QuestionAttribute.php
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/Token.php Diff File
mod - application/views/installer/optconfig_view.php Diff File
mod - docs/release_notes.txt Diff File