Damian Mooyman 46cbe809ac Merge remote-tracking branch 'origin/3.1' into 3.2 ... # Conflicts: # docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md # docs/en/02_Developer_Guides/14_Files/01_Image.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md # docs/en/03_Upgrading/index.md # docs/en/05_Contributing/01_Code.md # forms/TreeMultiselectField.php # security/Permission.php		2016-01-19 14:00:19 +13:00
..
00_Issues_and_Bugs.md	Update 00_Issues_and_Bugs.md	2015-06-18 20:04:07 +12:00
01_Code.md	Merge remote-tracking branch 'origin/3.1' into 3.2	2016-01-19 14:00:19 +13:00
02_Request_for_comment.md	DOCS SilverStripe core RFC process, template and archive links to past RFCs.	2015-11-19 16:05:49 +13:00
03_Release_Process.md	DOCS update framework and cms milestone links	2015-11-19 11:34:01 -06:00
04_Making_A_SilverStripe_Core_Release.md	Corrected release docs merge pipeline	2016-01-05 14:08:49 +13:00
05_Documentation.md	Documentation on the release process	2015-12-04 15:09:58 +13:00
06_Translations.md	Documentation on the release process	2015-12-04 15:09:58 +13:00
07_Translation_Process.md	Documentation on the release process	2015-12-04 15:09:58 +13:00
08_Core_committers.md	Documentation on the release process	2015-12-04 15:09:58 +13:00
09_Code_of_conduct.md	Documentation on the release process	2015-12-04 15:09:58 +13:00
index.md	DOCS Reference to ensure contributors read over the Code of conduct	2015-02-16 10:28:52 +13:00