miscellaneous · 113c28e44f9c4fea343324f994cda40a5cc69779 · Gyuricska Milán / cloud · GitLab

History Find file

Merge branch 'master' into feature-template-list · 986782b5
```
Conflicts:
	circle/dashboard/views.py
```
Őry Máté committed Sep 03, 2014
986782b5

Name	Last commit	Last Update
..
manager.conf		Loading commit data...
mancelery.conf		Loading commit data...
moncelery.conf		Loading commit data...
nginx-uwsgi.conf		Loading commit data...
portal-uwsgi.conf		Loading commit data...
portal.conf		Loading commit data...
slowcelery.conf		Loading commit data...