Ingo Schommer c11b3918fc Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: admin/css/screen.css admin/scss/_style.scss core/PaginatedList.php email/Mailer.php		2013-01-21 11:14:57 +01:00
..
_images	Added docs for composer	2012-11-03 18:00:58 +13:00
changelogs	Updated changelog notes	2012-12-18 10:40:05 +01:00
howto	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-08 17:16:09 +01:00
installation	Update documentation of nginx configuration	2013-01-11 15:54:49 +01:00
misc	Added docs about which branch to choose	2012-12-21 14:26:51 +01:00
reference	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-21 11:14:57 +01:00
topics	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-21 11:14:57 +01:00
tutorials	Update docs/en/tutorials/1-building-a-basic-site.md	2013-01-08 15:52:46 +00:00
index.md	Corrected a number of inbound links pointing to the documentation.	2012-10-09 14:53:47 +13:00