diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-05-28 16:02:46 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-05-28 16:02:46 +0000 |
| commit | a497a1351357440700edb237d41ca9af3d1a0aea (patch) | |
| tree | 84aa4929fbb3f913cf91fcc2c5411543b1236dde | |
| parent | ee54044ddaed11bd83161e98854e4411ebb91cde (diff) | |
| parent | 9d911d9f79e98fa2059724352abd18f882f99387 (diff) | |
| download | definitions-a497a1351357440700edb237d41ca9af3d1a0aea.tar.gz | |
Merge remote-tracking branch 'origin/baserock/richarddale/metadata_contents'
Conflicts:
morphlib/app.py
Also fixed copyright year in tests/trove-id.script, which was not from
Richard's patch, but from an earlier commit, and all my own fault.
0 files changed, 0 insertions, 0 deletions