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
..
01_Installation	Merge remote-tracking branch 'origin/3.1' into 3.2	2016-01-19 14:00:19 +13:00
02_Composer.md	Update 02_Composer.md	2015-12-17 11:57:46 +01:00
03_Environment_Management.md	Update changelogs to include PDO upgrade instructions	2015-10-07 16:11:42 +13:00
04_Directory_Structure.md	DOCS - fix reported broken links by zippy in IRC	2015-01-14 08:59:55 +13:00
05_Coding_Conventions.md	Merge remote-tracking branch 'origin/3.1' into 3.2	2016-01-19 14:00:19 +13:00
00_Server_Requirements.md	DOCS Bump PHP version in Server Requirements	2015-06-20 11:32:29 +01:00
index.md	Typo.	2015-07-08 14:40:42 +12:00