Merge branch 'master' into issue-139
Conflicts: circle/dashboard/templates/dashboard/_notifications-timeline.html circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html circle/dashboard/templates/dashboard/notifications/ownership-offer.html circle/dashboard/templates/dashboard/notifications/vm-destroyed.html circle/dashboard/templates/dashboard/notifications/vm-expiring.html circle/dashboard/templates/dashboard/notifications/vm-suspended.html circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
Showing
circle/dashboard/static/template.css
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.