Skip to content
Snippets Groups Projects
Unverified Commit 788ab95c authored by Marco Ciotola's avatar Marco Ciotola
Browse files

Merge remote-tracking branch 'benadida/master' into django-1.11

# Conflicts:
#	helios/views.py
parents c57f1ac6 c4b0c12d
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment