-
Merge branch 'dev_cooperatic' into 't869_couchdb_in_reception' · 3cffa958
# Conflicts: # reception/views.py # templates/reception/reception_produits.html
François C. authored
×
# Conflicts: # reception/views.py # templates/reception/reception_produits.html