Damian Mooyman 58cb0af753 Merge remote-tracking branch 'origin/3' ... Conflicts: composer.json docs/en/00_Getting_Started/00_Server_Requirements.md docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md docs/en/00_Getting_Started/04_Directory_Structure.md docs/en/01_Tutorials/01_Building_A_Basic_Site.md docs/en/01_Tutorials/02_Extending_A_Basic_Site.md docs/en/01_Tutorials/03_Forms.md docs/en/01_Tutorials/04_Site_Search.md docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md docs/en/01_Tutorials/index.md docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md docs/en/02_Developer_Guides/01_Templates/06_Themes.md docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md docs/en/02_Developer_Guides/05_Extending/05_Injector.md docs/en/02_Developer_Guides/14_Files/index.md docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md docs/en/04_Changelogs/3.1.9.md docs/en/05_Contributing/00_Issues_and_Bugs.md docs/en/05_Contributing/02_Release_Process.md docs/en/05_Contributing/03_Documentation.md		2015-01-16 10:08:40 +13:00
..
00_Issues_and_Bugs.md	Review and tidy up contributing documentation.	2014-12-17 15:48:57 +13:00
01_Code.md	Restructure of the docs markdown source files into more logical taxonomy	2014-12-17 15:48:35 +13:00
02_Release_Process.md	Semver documented in release process	2014-12-17 15:50:06 +13:00
03_Documentation.md	Added documentation writing style guide points	2014-12-17 15:50:05 +13:00
04_Translations.md	Review and tidy up contributing documentation.	2014-12-17 15:48:57 +13:00
05_Translation_Process.md	Review and tidy up contributing documentation.	2014-12-17 15:48:57 +13:00
06_Core_commiters.md	DOCS Core committers should have 2 t's	2015-01-05 10:57:15 +13:00
06_Core_committers.md	DOCS Core committers should have 2 t's	2015-01-05 10:57:15 +13:00
index.md	Review and tidy up contributing documentation.	2014-12-16 11:01:13 +13:00