Daniel Hensby a0812f987a

Merge 3.1 into 3.2 ...

Conflicts:
	admin/javascript/LeftAndMain.js
	control/HTTPRequest.php
	docs/en/00_Getting_Started/00_Server_Requirements.md

2016-04-26 00:09:33 +01:00

..

01_Installation

DOCS 3.2 : fixing api: links now that api: tag parser working

2016-02-17 18:02:38 -07:00

00_Server_Requirements.md

Merge 3.1 into 3.2

2016-04-26 00:09:33 +01: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

index.md

Typo.

2015-07-08 14:40:42 +12:00