circle/dashboard/static/dashboard/template-list.js · 43de3dcb77dc7bdf31c67e8fad3737ba56bc960e · CIRCLE / cloud

Merge branch 'master' into feature-pipeline · 67ab8684

Conflicts:
	circle/dashboard/static/dashboard/dashboard.js
	circle/dashboard/static/dashboard/disk-list.js
	circle/dashboard/static/dashboard/group-details.js
	circle/dashboard/static/dashboard/node-details.js
	circle/dashboard/static/dashboard/node-list.js
	circle/dashboard/static/dashboard/vm-details.js
	circle/dashboard/static/dashboard/vm-tour.js
	circle/dashboard/templates/dashboard/base.html
	circle/dashboard/templates/dashboard/index-nodes.html
	circle/dashboard/templates/dashboard/vm-detail.html

committed Oct 28, 2014

67ab8684

template-list.js 3.15 KB