Commit a56f7f2e by Czémán Arnold

Merge branch 'ceph' of https://git.ik.bme.hu/circle/cloud into ceph

Conflicts:
	circle/dashboard/static/dashboard/dashboard.js
parents 39bfcc59 c5c309fa
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment