Ingo Schommer 63c8441410 Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: admin/javascript/LeftAndMain.js		2013-03-21 00:11:17 +01:00
..
_images	Added docs for composer	2012-11-03 18:00:58 +13:00
changelogs	Added note about deprecations to 3.1 upgrading guide	2013-03-20 10:28:39 +01:00
howto	Docs - Howto: Customize the Pages List in the CMS	2013-03-18 13:55:15 +01:00
installation	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-03-21 00:11:17 +01:00
misc	Merge pull request #1274 from simonwelsh/update-conventions	2013-03-20 03:56:45 -07:00
reference	Merge branch '3.0' into 3.1	2013-03-19 22:27:09 +11:00
topics	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-03-19 14:04:29 +01:00
tutorials	Adjusted docs to "simple" theme (thanks Nadeeth Lansakara)	2013-03-17 20:58:06 +01:00
index.md	Corrected a number of inbound links pointing to the documentation.	2012-10-09 14:53:47 +13:00