circle/dashboard/templates · 9b48cc0cb26824851ba15fe424d957d7db33f7cf · Fukász Rómeó Ervin / cloud · GitLab

History Find file

Merge branch 'master' into connect-via-client · 08a3542b
```
Conflicts:
	circle/dashboard/templates/dashboard/vm-detail.html
	circle/dashboard/views.py
```
Őry Máté committed Sep 03, 2014
08a3542b

Name	Last commit	Last Update
..
crispy_forms		Loading commit data...
dashboard		Loading commit data...
base.html		Loading commit data...
display-form-errors.html		Loading commit data...