Merge branch 'master' into issue-sliders
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/views.py
Showing
This diff is collapsed.
Click to expand it.
circle/dashboard/virtvalidator.py
0 → 100644
Please
register
or
sign in
to comment