Files · 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
circle		Loading commit data...
docs		Loading commit data...
miscellaneous		Loading commit data...
requirements		Loading commit data...
.gitignore		Loading commit data...
CONTRIBUTORS.txt		Loading commit data...
LICENSE.txt		Loading commit data...
README.rst		Loading commit data...
firewall-dump.json		Loading commit data...
requirements.txt		Loading commit data...