Merge remote-tracking branch 'origin/master' into feature-vm-tasks
Conflicts: circle/vm/models/instance.py circle/vm/tests/test_models.py
Showing
Please
register
or
sign in
to comment
Conflicts: circle/vm/models/instance.py circle/vm/tests/test_models.py