LimeSurvey: develop d811da62

Diff Back to Repository
Author Committer Branch Timestamp Parent
TonisOrmisson TonisOrmisson develop 2017-11-08 15:41:22 develop 9d7567d6
Changeset

Merge remote-tracking branch 'upstream/develop' into fix-tests-cleanup

Conflicts:
tests/TestBaseClass.php
tests/TestBaseClassView.php
tests/TestBaseClassWeb.php
tests/questions/DateTimeValidationTest.php
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - tests/TestBaseClassView.php Diff File