2 Commits

Author	SHA1	Message	Date
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
Chris Corbyn	e71e82f8ac	Add missing fixture file ... Signed-off-by: Chris Corbyn <chris@w3style.co.uk>	2014-06-11 10:09:54 +00:00