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 |
||
|---|---|---|
| .. | ||
| css | ||
| img | ||
| js | ||
| locale | ||
| favicon.ico | ||
| generic_cover.jpg | ||
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 |
||
|---|---|---|
| .. | ||
| css | ||
| img | ||
| js | ||
| locale | ||
| favicon.ico | ||
| generic_cover.jpg | ||