circle/dashboard/templates/dashboard/group-list · 03e045a2536a7eb384b1abf7e99edbe206c25143 · Gelencsér Szabolcs / 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
..
column-actions.html		Loading commit data...
column-admin.html		Loading commit data...
column-details.html		Loading commit data...
column-id.html		Loading commit data...
column-name.html		Loading commit data...
column-username.html		Loading commit data...
column-users.html		Loading commit data...
test-one.html		Loading commit data...