circle/dashboard/templates · 96fe17cef065c909215013f11dbe8ac6226c6542 · Fukász Rómeó Ervin / cloud · GitLab

History Find file

Merge branch 'master' into feature-new-tour · 96fe17ce
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
	circle/dashboard/urls.py
```
Kálmán Viktor committed Sep 10, 2014
96fe17ce

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