circle/dashboard/templates/dashboard/vm-detail/home.html · 96f1d71c6dd25ce65378dfbce27b2ed0009e2c42 · 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

home.html 4.08 KB