Merge branch 'dev_principale' into 'dev_cooperatic'
# Conflicts: # coops_configurations/config_lacagette.py
Showing
.gitattributes
0 → 100644
LICENSE.txt
0 → 100644
This diff is collapsed.
Click to expand it.
couchdb-coops-init.json
deleted
100644 → 0
couchdb-envelop-init.json
deleted
100644 → 0
couchdb-setup.sh
deleted
100755 → 0
data/inventories_backup/readme.txt
0 → 100644
data/readme.txt
0 → 100644
log/readme.txt
0 → 100644
members/management/commands/couchdb.py
0 → 100644
This diff is collapsed.
Click to expand it.
temp/readme.txt
0 → 100644
Please
register
or
sign in
to comment