circle/dashboard · a46d3f9c2a275efe97f97ed435ed1bd077436ac1 · Fukász Rómeó Ervin / cloud · GitLab

History Find file

Merge branch 'master' into feature-template-wizard · a46d3f9c

Conflicts:
	circle/dashboard/templates/dashboard/vm-detail.html
	circle/dashboard/urls.py
	circle/dashboard/views.py

committed Apr 22, 2014

Name	Last commit	Last Update
..
fixtures		Loading commit data...
migrations		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
tests		Loading commit data...
vm		Loading commit data...
__init__.py		Loading commit data...
admin.py		Loading commit data...
context_processors.py		Loading commit data...
forms.py		Loading commit data...
models.py		Loading commit data...
tables.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...