Chris Corbyn 1b5bf6e12a Merge remote-tracking branch 'upstream/master' into feature/auto_start ... Signed-off-by: Chris Corbyn <chris@w3style.co.uk> Conflicts: tests/fixtures/simple-figfile/fig.yml tests/unit/project_test.py		2014-06-12 22:05:51 +00:00
..
_layouts	Put Orchard in docs sidebar	2014-05-14 13:05:40 +01:00
css	Compress the sidebar a bit	2014-05-14 16:32:39 +01:00
img	Move docs to master branch	2014-01-27 11:51:15 +00:00
.gitignore-gh-pages	Move docs to master branch	2014-01-27 11:51:15 +00:00
_config.yml	Use utf8 when building docs	2014-03-08 18:28:41 -07:00
cli.md	Rename --no-links to --only	2014-06-11 10:50:45 +00:00
django.md	Add PYTHONUNBUFFERED=1 to Django tutorial	2014-05-22 14:15:17 +01:00
Dockerfile	Move docs to master branch	2014-01-27 11:51:15 +00:00
env.md	Document how to see env vars for a service	2014-01-30 10:49:31 +00:00
fig.yml	Documentation: Include notes on mapping ports	2014-03-03 13:37:15 +00:00
Gemfile	Move docs to master branch	2014-01-27 11:51:15 +00:00
Gemfile.lock	Move docs to master branch	2014-01-27 11:51:15 +00:00
index.md	Put Orchard in docs sidebar	2014-05-14 13:05:40 +01:00
install.md	Update to docs to Docker 1.0.0	2014-06-10 14:58:06 -07:00
rails.md	Documentation: Include notes on mapping ports	2014-03-03 13:37:15 +00:00
wordpress.md	Remove unneeded 'ports' entries from WP and Django fig.ymls in docs	2014-03-04 21:54:10 +00:00
yml.md	Document 'auto_start' in fig.yml	2014-06-09 01:31:50 +00:00