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

History Find file

Merge branch 'master' into feature-new-tour · df7e52cf
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
	circle/dashboard/views.py
```
Kálmán Viktor committed Oct 06, 2014
df7e52cf

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...