Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
2 merge requests!13Master,!11Fix celery
Pipeline #28996 passed
Showing
with 298 additions and 585 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment