Skip to content

T
third-party
Commit 3cffa958 by François C.
Options

Merge branch 'dev_cooperatic' into 't869_couchdb_in_reception' 

# Conflicts:
#   reception/views.py
#   templates/reception/reception_produits.html
parents 983b0430 2727fc54
Pipeline #1081 passed with stage
in 21 seconds