Daniel Hensby 745faebd81 Merge 3.2 into 3.3 ... Conflicts: .travis.yml		2016-04-26 00:17:09 +01:00
..
How_Tos	Merge remote-tracking branch 'origin/3.2' into 3.3	2016-02-24 17:29:06 +13:00
01_Syntax.md	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-06-19 10:48:07 +12:00
02_Common_Variables.md	Merge 3.2 into 3.3	2016-04-26 00:17:09 +01:00
03_Requirements.md	DOCS 3.2 : fixing api: links now that api: tag parser working	2016-02-17 18:02:38 -07:00
04_Rendering_Templates.md	DOCS Missing closing perenthesis	2015-06-26 15:36:49 +12:00
05_Template_Inheritance.md	Standardise spelling of "customise"	2016-03-30 13:17:28 +13:00
06_Themes.md	Standardise spelling of "customise"	2016-03-30 13:17:28 +13:00
07_Caching.md	Spelling	2015-08-05 21:34:35 +12:00
08_Translations.md	Tidy up templates guide	2014-12-15 09:12:46 +13:00
09_Casting.md	DOCS 3.2 : fixing api: links now that api: tag parser working	2016-02-17 18:02:38 -07:00
index.md	Standardise spelling of "customise"	2016-03-30 13:17:28 +13:00