Commit aaf35830 by Arnaud B

Merge remote-tracking branch 'origin/dev_cooperatic' into ticket_820

# Conflicts:
#	reception/views.py
parents 6580b448 f520fc11
Pipeline #1035 passed with stage
in 21 seconds