Simon Welsh e90012787d Merge branch 'hackfest_may_2013' of https://github.com/NightJar/sapphire into 3.1 ... Conflicts: docs/en/changelogs/3.1.0.md		2013-05-25 20:07:54 +12:00
..
_images	Added docs for composer	2012-11-03 18:00:58 +13:00
changelogs	Merge branch 'hackfest_may_2013' of https://github.com/NightJar/sapphire into 3.1	2013-05-25 20:07:54 +12:00
howto	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-05-09 10:34:20 +02:00
installation	Check that Webserver is not Apache/1.x in light of installer assets/.htaccess alterations	2013-05-25 20:03:36 +12:00
misc	Updated github path	2013-05-17 00:45:52 +02:00
reference	NEW UploadField displays a warning before overwriting files (only relevant if config.yml: Upload:replaceFile = true).	2013-05-25 19:07:06 +12:00
topics	Update commandline.md	2013-05-25 19:07:17 +12:00
tutorials	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-05-09 10:34:20 +02:00
index.md	Corrected a number of inbound links pointing to the documentation.	2012-10-09 14:53:47 +13:00