Skip to content

T
third-party

Merge branch 'dev_cooperatic' into 'ticket_2828' 

# Conflicts:
#   shelfs/static/js/shelf_inventory.js
2 jobs from ticket_2828 in 1 minute 29 seconds
0d39f02b 0d39f02b9b5d4d7b90e1a8bbd2b6ade4ef35b81e
Status Job ID Name Coverage
  Test
passed #3494
lint:js

00:21

passed #3495
unit:django

01:07