circle/dashboard/templates/dashboard/lease-edit.html · 325b8bbafb916d7d79b6d8cf860a910e2a4619cd · Gutyán Gábor / circlestack

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

lease-edit.html 3.87 KB