Ingo Schommer 3690ae1658 Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: docs/en/changelogs/index.md		2013-08-16 17:12:12 +02:00
..
_images	FIX Remove instances of lines longer than 120c	2012-09-30 17:18:13 +13:00
_resources	Pointer to CMS architecture docs	2012-08-05 20:39:05 +02:00
1-building-a-basic-site.md	Fixed Grammatical errors and issues where sentences didn't make sense.	2013-08-09 15:22:03 +12:00
2-extending-a-basic-site.md	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-05-09 10:34:20 +02:00
3-forms.md	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-05-09 10:34:20 +02:00
4-site-search.md	Consistently used dollar notation in template docs (see #1794)	2013-04-26 11:48:59 +02:00
5-dataobject-relationship-management.md	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-05-09 10:34:20 +02:00
index.md	Fixed issue with inconsistent use of punctuation and wording of Tutorial 5 summary	2013-08-09 14:20:41 +12:00