test_views.py
69.4 KB
-
Merge remote-tracking branch 'origin/master' into feature-vm-tasks · e11fffa5
Conflicts: circle/vm/models/instance.py circle/vm/tests/test_models.py
Bach Dániel committed
Conflicts: circle/vm/models/instance.py circle/vm/tests/test_models.py