Ingo Schommer 32478ab512 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php

2013-09-27 19:07:13 +02:00

..

adminpanels.yml

BUGFIX: Make Page panel the default again after the recent addition of AdminRootController

2012-05-19 14:43:25 +12:00

config.yml

Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798)

2013-07-31 09:30:58 +01:00

i18n.yml

Add config fragment for new i18n ordering system

2012-08-28 17:23:48 +12:00

routes.yml

Explicitly added routes (following removal of auto-routing controllers)

2013-01-29 14:59:54 +01:00