jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
compose/tests
History
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
..
fixtures Merge remote-tracking branch 'upstream/master' into feature/auto_start 2014-06-12 22:05:51 +00:00
integration Merge remote-tracking branch 'upstream/master' into feature/auto_start 2014-06-12 22:05:51 +00:00
unit Merge remote-tracking branch 'upstream/master' into feature/auto_start 2014-06-12 22:05:51 +00:00
__init__.py Fix Python 2.6 2014-01-06 17:58:49 +00:00