Commit 83db0aad by François C.

Merge branch 'dev_cooperatic' into '#1925-ACL-multiple-down-key-cause-error'

# Conflicts:
#   orders/static/js/orders_helper.js
parents 6065759d 46d9ed42
Pipeline #1745 passed with stage
in 1 minute 37 seconds