Daniel Hensby ca8d0f2818 Merge branch '3.1' into 3.2 ...

Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php

2015-07-20 10:48:01 +01: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

FIX Uneccessary class replacement

2015-01-08 20:53:45 +13: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