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

Conflicts:
	tests/unit/functions/version_check_test.php

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

..

modules.yml

[ticket/555] Allow defining default currency in ACP

2015-06-03 12:53:21 +02:00

routing.yml

[ticket/465] Use path instead of pattern in routing.yml

2015-02-11 11:53:19 +01:00

services.yml

Merge branch '2.1.x'

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