Graham Campbell d20ee2987b Merge branch '1.2' ...

Conflicts:
	composer.lock
	resources/views/partials/incidents.blade.php

2015-09-04 11:53:25 +01:00

..

assets

Working on a widget design for the dashboard index

2015-08-31 18:17:00 +01:00

lang

Added metrics filter dropdown. Closes #518

2015-08-14 22:41:37 +01:00

views

Merge branch '1.2'

2015-09-04 11:53:25 +01:00