Commit 0a18f54c authored by Fabien  MAREUIL's avatar Fabien MAREUIL
Browse files

Merge branch 'master' into 'fix_celery'

# Conflicts:
#   ippisite/ippisite/decorator.py
parents cde0437c 2af7683b
Pipeline #28996 passed with stages
in 11 minutes and 15 seconds