Merge remote-tracking branch 'cover/thumbnails' into cover_thumb
# Conflicts: # cps/admin.py # cps/templates/author.html # cps/templates/layout.html # cps/ub.py # cps/web.py # requirements.txtpull/1771/head
commit
30e897af48
# Conflicts: # cps/admin.py # cps/templates/author.html # cps/templates/layout.html # cps/ub.py # cps/web.py # requirements.txtpull/1771/head