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 | 5df056c4c06f2a74ed4d5ee965c5bcf237295c58 (patch) | |
| tree | 72aa72f57f101bd0679ddaab933e818e312d47bc /tests | |
| parent | fc56e7d8c4bc712709be3ecf290d775d3dbf9996 (diff) | |
| parent | 75f8ac3925b2073fc94b543bad8a9a4e2500c715 (diff) | |
| download | morph-5df056c4c06f2a74ed4d5ee965c5bcf237295c58.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.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/trove-id.script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/trove-id.script b/tests/trove-id.script index 7157559b..998bde44 100755 --- a/tests/trove-id.script +++ b/tests/trove-id.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |