diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-03-27 11:13:30 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-03-27 11:13:30 +0000 |
commit | f56259c2ce62c301f0e0f9dd7c85001b45fc8f5c (patch) | |
tree | bdf2e7ad0985212e306d5b970c0999087b81f91b /tests.merging/rename-stratum.exit | |
parent | 170d81eba0568856401f57ce655ad9881b802d21 (diff) | |
parent | 9cbf777d614b8f240ccaa0203e7e3ba40b487f11 (diff) | |
download | morph-f56259c2ce62c301f0e0f9dd7c85001b45fc8f5c.tar.gz |
Merge branch 'baserock/richardipsum/merge_distbuild'
Conflicts:
morphlib/plugins/deploy_plugin.py
without-test-modules
Reviewed by:
Richard Maw
Lars Wirzenius
Diffstat (limited to 'tests.merging/rename-stratum.exit')
0 files changed, 0 insertions, 0 deletions