-
Merge branch 'master' into feature-pipeline · 67ab8684Conflicts: circle/dashboard/static/dashboard/dashboard.js circle/dashboard/static/dashboard/disk-list.js circle/dashboard/static/dashboard/group-details.js circle/dashboard/static/dashboard/node-details.js circle/dashboard/static/dashboard/node-list.js circle/dashboard/static/dashboard/vm-details.js circle/dashboard/static/dashboard/vm-tour.js circle/dashboard/templates/dashboard/base.html circle/dashboard/templates/dashboard/index-nodes.html circle/dashboard/templates/dashboard/vm-detail.html
Kálmán Viktor committed
| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| settings | Loading commit data... | |
| __init__.py | Loading commit data... | |
| urls.py | Loading commit data... | |
| wsgi.py | Loading commit data... |