LimeSurvey: develop 817a3597

Diff Back to Repository
Author Committer Branch Timestamp Parent
TonisOrmisson TonisOrmisson develop 2017-11-07 01:44:13 develop 05dcbabd
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 - tests/TestBaseClass.php Diff File
mod - tests/TestBaseClassView.php Diff File
mod - tests/TestBaseClassWeb.php Diff File
mod - tests/data/views/adminBaseViews.php Diff File