Commit ca15148f by Czémán Arnold

Merge branch 'master' into issue_458

Conflicts:
	circle/dashboard/views/util.py
parents c894c76d 56975960
Pipeline #212 passed with stage
in 0 seconds