circle/dashboard · 4b1d3f502e3a57c36d9062aff9693acecf3198a2 · Gelencsér Szabolcs / cloud · GitLab

History Find file

Merge branch 'issue-24' into feature-save-as · 4b1d3f50
```
Conflicts:
	circle/dashboard/views.py
	circle/storage/models.py
```
Guba Sándor committed Mar 12, 2014
4b1d3f50

Name	Last commit	Last Update
..
fixtures		Loading commit data...
migrations		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
tests		Loading commit data...
__init__.py		Loading commit data...
forms.py		Loading commit data...
models.py		Loading commit data...
tables.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...