diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2013-02-25 10:00:50 +0100 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2013-02-25 10:00:50 +0100 |
| commit | 659ffcb2afaedf8cf724894a6cea0ffb585ee220 (patch) | |
| tree | 43c8a41a2ae148d30ce2a21e42aca6260875e6cc /COPYING | |
| parent | 94711787487f3f3dae26979bcbdbeeb77ed883ae (diff) | |
| parent | 3c3e94bf5026d27d9307a825bae77dba968a1d9f (diff) | |
| download | debian-dedup-659ffcb2afaedf8cf724894a6cea0ffb585ee220.tar.gz | |
Merge branch 'crosshash'
Conflicts in webapp.py:
* The fetchall -> fetchiter change caused big conflicts.
* New hash combination (image_sha512, image_sha512) added.
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions