Merge remote-tracking branch 'origin/issue-404'
Conflicts: circle/dashboard/templates/dashboard/vm-detail/console.html
Showing
Please
register
or
sign in
to comment
Conflicts: circle/dashboard/templates/dashboard/vm-detail/console.html