Damian Mooyman 09210efbc0 Merge remote-tracking branch 'origin/3' ...

Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php

2015-07-31 15:49:35 +12:00

..

How_Tos

Cleanup 3.2 changelog for release

2015-06-15 16:19:08 +12:00

00_Modules.md

Review and clean up of extending section

2014-12-17 15:49:08 +13:00

01_Extensions.md

Update 01_Extensions.md

2015-04-02 15:51:51 +13:00

04_Shortcodes.md

Define function as static (line 59)

2015-06-30 11:29:26 +12:00

05_Injector.md

NEW: Add ‘calls’ section to Injector configs.

2015-07-30 19:34:46 +12:00

06_Aspects.md

Review and clean up of extending section

2014-12-17 15:49:08 +13:00

07_Templates.md

Review and clean up of extending section

2014-12-17 15:49:08 +13:00

index.md

Review and clean up of extending section

2014-12-17 15:49:08 +13:00