Marc Alexander f64825e730 Merge branch '2.1.x' ...

Conflicts:
	tests/unit/functions/version_check_test.php

2015-06-13 18:20:43 +02:00

..

functional

[ticket/534] Adapt tests for master branch of phpBB

2015-05-01 15:00:46 +02:00

mock

[ticket/508] Only execute portal once when accessed via domain only

2015-03-15 15:26:32 +01:00

systemtests

[ticket/275] Fix incorrect copyrights in portal files

2014-06-28 13:54:19 +02:00

testframework

[ticket/275] Fix incorrect copyrights in portal files

2014-06-28 13:54:19 +02:00

unit

Merge branch '2.1.x'

2015-06-13 18:20:43 +02:00