circle/dashboard/templates/dashboard/template-list.html · 822e58c55a4369b6ff2ff3488d53eeea5145e4f1 · Gelencsér Szabolcs / 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

template-list.html 1.79 KB