circle/vm/tests · 980138db490a8ba936b1991ad864a0b4acd37b79 · Fukász Rómeó Ervin / cloud · GitLab

History Find file

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 Oct 01, 2014
e11fffa5

Name	Last commit	Last Update
..
__init__.py		Loading commit data...
test_models.py		Loading commit data...
test_operations.py		Loading commit data...