circle/dashboard/templates · cbbcfb7b1b751bc7c2a304dc6007cca147440222 · Gelencsér Szabolcs / cloud · GitLab

History Find file

Merge remote-tracking branch 'origin/feature-datastore' · cbbcfb7b
```
Conflicts:
	circle/dashboard/forms.py
	circle/dashboard/tables.py
	circle/dashboard/urls.py
```
Bach Dániel committed Feb 24, 2015
cbbcfb7b

Name	Last commit	Last Update
..
crispy_forms		Loading commit data...
dashboard		Loading commit data...
django_tables2		Loading commit data...
base.html		Loading commit data...
branding.html		Loading commit data...
display-form-errors.html		Loading commit data...