circle/dashboard/static · 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
..
dashboard		Loading commit data...
compile_bootstrap.less		Loading commit data...
local-logo.png		Loading commit data...
template.less		Loading commit data...