circle/dashboard · 146d7521fd13edc71bcc33fcaabb0a1500849fee · Fukász Rómeó Ervin / cloud

Merge branch 'master' into feature-base-template · 325b8bba

Conflicts:
	circle/dashboard/templates/dashboard/template-list.html
	circle/dashboard/templates/dashboard/vm-detail/home.html
	circle/dashboard/views.py

committed Jul 14, 2014

325b8bba

Name	Last commit	Last Update
..
fixtures		Loading commit data...
migrations		Loading commit data...
static		Loading commit data...
tasks		Loading commit data...
templates		Loading commit data...
templatetags		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...