circle/dashboard/templates/dashboard/_notifications-timeline.html · 7f451e3e5d84bffbdc8930b3c88a69025652757e · Gutyán Gábor / circlestack

Project
Repository
Issues 0
Merge Requests 0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards

Merge branch 'master' into issue-139 · 96f1d71c

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

committed Jul 16, 2014

96f1d71c

_notifications-timeline.html 649 Bytes