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
..
__init__.py	Split tests into unit and integration	2014-04-25 22:58:21 +01:00
cli_test.py	Rename --no-links to --only	2014-06-11 10:50:45 +00:00
project_test.py	Rename --keep-old to --no-recreate	2014-06-09 01:31:51 +00:00
service_test.py	Move keep_old check up into Project	2014-06-09 01:31:50 +00:00
testcases.py	Use busybox in fixtures, instead of ubuntu	2014-06-11 10:25:50 +00:00