Ingo Schommer 8ab66c93b6 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	code/reports/Report.php
	composer.json

2013-01-21 11:24:05 +01:00

..

_old

Remove outdated ReportAdmin assets

2013-01-21 16:53:19 +13:00

CMSMain.css

API-CHANGE sapphire folder can now be renamed.

2012-04-15 10:56:40 +12:00

screen.css

Moving "edit tree" button next to "add new" (fixes #8119)

2012-12-17 15:35:52 +01:00

SilverStripeNavigator.css

NEW Re-added SilverStripeNavigator styling

2012-08-27 11:53:57 +02:00