circle/dashboard/templates/dashboard/vm-list.html · 5fe2e9595a6af80896c5ea6165282094baab7c51 · CIRCLE / cloud

Merge branch 'master' into feature-pipeline · 8e1635ef

Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
	circle/dashboard/static/dashboard/vm-details.js
	circle/dashboard/templates/base.html
	circle/dashboard/templates/dashboard/index-vm.html

committed Sep 16, 2014

8e1635ef

vm-list.html 6.33 KB