Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view

# Conflicts:
#	cps/ub.py
#	cps/web.py
pull/1306/head
pthiben 5 years ago
commit 2874cf531c
Loading…
Cancel
Save