circle · 207f7413617b5e47fe7358147c320ff3d8b3a287 · Gyuricska Milán / cloud · GitLab

History Find file

Merge branch 'master' into feature-mass-ops · 207f7413
```
Conflicts:
	circle/dashboard/templates/dashboard/vm-list.html
	circle/dashboard/views.py
```
Kálmán Viktor committed Aug 18, 2014
207f7413

Name	Last commit	Last Update
..
acl		Loading commit data...
circle		Loading commit data...
common		Loading commit data...
dashboard		Loading commit data...
firewall		Loading commit data...
locale/hu/LC_MESSAGES		Loading commit data...
manager		Loading commit data...
monitor		Loading commit data...
network		Loading commit data...
storage		Loading commit data...
templates		Loading commit data...
vm		Loading commit data...
fabfile.py		Loading commit data...
manage.py		Loading commit data...