Merge remote-tracking branch 'cover/thumbnails' into development # Conflicts: # cps/admin.py # cps/templates/layout.html # cps/ub.py # cps/web.py Update join for sqlalchemy 1.4 |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| convert.py | ||
| database.py | ||
| mail.py | ||
| thumbnail.py | ||
| upload.py | ||