LimeSurvey: develop dd6335d6

Diff Back to Repository
Author Committer Branch Timestamp Parent
TonisOrmisson TonisOrmisson develop 2017-11-08 15:46:25 develop 7dea3d29
Changeset

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

Conflicts:
tests/TestBaseClassView.php
tests/TestBaseClassWeb.php
mod - .travis.yml Diff File
mod - tests/TestBaseClassView.php Diff File
mod - tests/TestBaseClassWeb.php Diff File