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

Conflicts:
	tests/unit/event/listener_test.php

2015-06-24 16:10:22 +02:00

..

functional

[ticket/614] Select correct role ID for hidden forum

2015-06-19 13:50:00 +02: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

Merge branch '2.1.x'

2015-06-24 16:10:22 +02:00