circle/dashboard/static/dashboard/vm-create.js · 14af9660db752630b2763aef2c5e337e0eedf91a · 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-create.js 9.19 KB