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

Conflicts:
	tests/unit/functions/version_check_test.php

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

..

acp

Merge branch '2.1.x'

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

controller

[ticket/546] Use phpbb\language\language for module language files

2015-05-06 11:46:49 +02:00

event

[ticket/560] Properly instantiate router class in tests

2015-06-03 15:54:08 +02:00

functions

Merge branch '2.1.x'

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

includes

[ticket/577] Fix tests

2015-06-06 23:46:05 +02:00

modules

[ticket/436] Mock controller helper for unit tests

2015-01-18 15:12:18 +01:00

portal

Merge branch '2.1.x'

2015-06-06 18:17:19 +02:00