diff options
| author | Thomas Goirand <thomas@goirand.fr> | 2013-11-20 19:47:48 +0800 |
|---|---|---|
| committer | Thomas Goirand <thomas@goirand.fr> | 2013-11-20 19:47:48 +0800 |
| commit | 1935fece8dc7ad5e4b24198fd0bf9c93ec80daa2 (patch) | |
| tree | 45abcb6788dd589c45d3cacb7a8c6347dd097761 /debian/source/format | |
| parent | 47a9ddc907a828ad079e5cdee6ed8c942af96d5e (diff) | |
| parent | 4523d576e9ad73f7ef14515bffc7c99c6184cdfd (diff) | |
| download | factory-boy-1935fece8dc7ad5e4b24198fd0bf9c93ec80daa2.tar factory-boy-1935fece8dc7ad5e4b24198fd0bf9c93ec80daa2.tar.gz | |
Merge branch 'debian/unstable' of ssh://git.gplhost.com/var/cache/git/openstack/factory-boy into debian/unstable
Conflicts:
debian/control
Diffstat (limited to 'debian/source/format')
| -rw-r--r-- | debian/source/format | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/source/format b/debian/source/format index 46ebe02..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt)
\ No newline at end of file +3.0 (quilt) |