Merge branch 'master' into issue-364
Conflicts: circle/dashboard/static/dashboard/vm-common.js circle/dashboard/templates/dashboard/store/index-files.html
Showing
This diff is collapsed.
Click to expand it.
Conflicts: circle/dashboard/static/dashboard/vm-common.js circle/dashboard/templates/dashboard/store/index-files.html