deploy.rst
4.81 KB
-
Merge branch 'master' into feature-base-template · 325b8bbaConflicts: circle/dashboard/templates/dashboard/template-list.html circle/dashboard/templates/dashboard/vm-detail/home.html circle/dashboard/views.py
Őry Máté committed