circle/dashboard/templates · 5912d4e8fe8c4bde182aae1bf61dc4b33dae53e8 · Fukász Rómeó Ervin / cloud · GitLab

History Find file

Merge branch 'master' into feature-template-wizard · 5912d4e8
```
Conflicts:
	circle/dashboard/urls.py
	requirements/local.txt
```
Kálmán Viktor committed Apr 30, 2014
5912d4e8

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