Marc Alexander 306101fee9 Merge branch 'ticket/669' into ticket/669-master ...

Conflicts:
	tests/functional/portal_announcement_test.php

2016-01-07 11:54:34 +01:00

..

functional

Merge branch 'ticket/669' into ticket/669-master

2016-01-07 11:54:34 +01:00

mock

[ticket/634] Add tests for clock module and improve tests for calendar

2015-06-23 00:48:52 +02: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

[ticket/660] Fix tests after recent changes to phpBB

2015-11-11 09:36:56 +01:00