Commit d6f1c224 by Szeberényi Imre

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

Conflicts:
	circle/vm/operations.py
parents bbb1a96f 431b7de0
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