diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2013-07-17 16:27:08 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2013-07-17 16:27:08 +0200 |
| commit | ed3e611cfc54b8c916e919701070bfd5c6770610 (patch) | |
| tree | fe06694d5a2212c87a0d149eccb0f4cbb889a5cd /COPYING | |
| parent | a03daac99a237babcd874748d19fc0f809a1dc60 (diff) | |
| parent | 6205c89b1e289f04dcea1e6e32fafa6357abf063 (diff) | |
| download | debian-dedup-ed3e611cfc54b8c916e919701070bfd5c6770610.tar.gz | |
Merge branch master into sqlalchemy
This basically pulls the packageid branch into sqlalchemy. The merge was
complex, because many sql statements diverged. The merge brings us one
step closer to supporting postgres, because an "INSERT OR REPLACE" was
removed from readyaml.py in the packageid branch.
Conflicts:
update_sharing.py
webapp.py
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions