Ingo Schommer 91f6039eed Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: control/Director.php		2013-11-05 10:15:40 +01:00
..
_images	Added docs for composer	2012-11-03 18:00:58 +13:00
changelogs	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-11-05 10:15:40 +01:00
howto	Merge pull request #2474 from wilr/externalcmslink	2013-10-02 02:38:56 -07:00
installation	Update docs to consistently use http://localhost/ (fixes #1919)	2013-10-23 20:24:52 +01:00
misc	API JS i18n files with short locale names, generated by build task	2013-10-25 12:05:46 +02:00
reference	Update docs to consistently use http://localhost/ (fixes #1919)	2013-10-23 20:24:52 +01:00
topics	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-11-05 10:15:40 +01:00
tutorials	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-09-12 17:33:36 +02:00
index.md	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-10-07 16:18:20 +02:00