circle/dashboard/static · 7bb230000e55e74f3a98f826f9a566c2c6f6368a · Gelencsér Szabolcs / cloud · GitLab

History Find file

Merge branch 'master' into issue-sliders · 7bb23000
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
	circle/dashboard/views.py
```
Kálmán Viktor committed Jul 29, 2014
7bb23000

Name	Last commit	Last Update
..
dashboard		Loading commit data...
grafikon.png		Loading commit data...
template.css		Loading commit data...