circle/dashboard · 62c9233e7fa22bccb3c9167e8aff1191ae27e016 · Gutyán Gábor / circlestack · GitLab

History Find file

Merge branch 'master' into acl · f2a517de

Conflicts:
	circle/dashboard/urls.py
	circle/dashboard/views.py
	circle/vm/models.py

committed Oct 30, 2013

Name	Last commit	Last Update
..
static/dashboard		Loading commit data...
templates/dashboard		Loading commit data...
__init__.py		Loading commit data...
models.py		Loading commit data...
tables.py		Loading commit data...
tests.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...