LimeSurvey: 2.1 d5286883

Diff Back to Repository
Author Committer Branch Timestamp Parent
user16774 user16774 2.1 2012-08-03 20:32 2.1 adc0c60c
Changeset

Merge branch 'Resolve' into Question_Objects

Conflicts:
application/helpers/expressions/em_manager_helper.php
application/modules/RankingQuestion.php
Merge in my resolution of the problem with LEMrel tags.
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/modules/NumberArrayQuestion.php Diff File
mod - application/modules/QuestionModule.php Diff File
mod - application/modules/RankingQuestion.php Diff File