Simon Welsh f9c44e4ceb Merge branch '3.0' into 3.1 ...

Conflicts:
	model/Versioned.php
	view/SSTemplateParser.php
	view/SSViewer.php

2014-03-30 18:15:12 +13:00

..

_images

Added docs for composer

2012-11-03 18:00:58 +13:00

changelogs

Merge branch '3.0' into 3.1

2014-03-30 18:15:12 +13:00

howto

more docs for GridField & ModelAdmin customization

2014-03-16 08:40:50 +00:00

installation

Merge branch '3.0' into 3.1

2014-03-10 22:56:27 +13:00

misc

NEW: Updating out of date URLs in the framework source code and docs

2014-02-07 15:10:44 +13:00

reference

Merge branch '3.0' into 3.1

2014-03-30 18:15:12 +13:00

topics

Improved SS_Cache docs, moved to /docs

2014-03-16 11:55:55 +13:00

tutorials

Minor fix for note about lack of news-file icon

2014-03-15 07:48:52 +11:00

index.md

Merge remote-tracking branch 'origin/3.0' into 3.1

2013-10-07 16:18:20 +02:00