Commit 2874cf53 authored by pthiben's avatar pthiben

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

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

# Conflicts:
#	cps/ub.py
#	cps/web.py
parents ea7058e8 20cc5107
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment