diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2013-08-02 08:40:49 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2013-08-02 08:40:49 +0200 |
| commit | cb3708825bf7ea32314040575cef35980dad0cd8 (patch) | |
| tree | 31575a8525dc90ba6904268d94f47e1604bf0557 /dedup/static/favicon.ico | |
| parent | a4bbbb6e664e605634cb3f9e0564c7e4a93697be (diff) | |
| parent | 2712edb550968ce7ec8cd9800241d7944666631a (diff) | |
| download | debian-dedup-cb3708825bf7ea32314040575cef35980dad0cd8.tar.gz | |
Merge branch master into sqlalchemy
This makes the sqlalchemy branch schema-compatible with master again.
The biggest change on master was the introduction of the function table.
It caused most of the conflicts. Note that webapp had one conflict not
detected by git: The selecting of issues in show_package needed
sqlalchemy conversion.
Conflicts:
README
update_sharing.py
webapp.py
Diffstat (limited to 'dedup/static/favicon.ico')
| -rw-r--r-- | dedup/static/favicon.ico | bin | 0 -> 4286 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/dedup/static/favicon.ico b/dedup/static/favicon.ico Binary files differnew file mode 100644 index 0000000..5039835 --- /dev/null +++ b/dedup/static/favicon.ico |