circle/dashboard/templates · b1575ee5056cafdd561280f85927c5ca1b283853 · Gyuricska Milán / cloud · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into issue_339 · b1575ee5
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.less
	circle/dashboard/views/vm.py
```
falusi94 committed Dec 10, 2017
b1575ee5

Name	Last commit	Last Update
..
crispy_forms		Loading commit data...
dashboard		Loading commit data...
django_tables2		Loading commit data...
base.html		Loading commit data...
branding.html		Loading commit data...
display-form-errors.html		Loading commit data...
open-graph.html		Loading commit data...