Commit 0d39f02b by François C.

Merge branch 'dev_cooperatic' into 'ticket_2828'

# Conflicts:
#   shelfs/static/js/shelf_inventory.js
parents ae224347 acd357d1
Pipeline #2175 passed with stage
in 1 minute 29 seconds