Commit Graph

2 Commits

Author SHA1 Message Date
Graham Campbell d20ee2987b Merge branch '1.2'
Conflicts:
	composer.lock
	resources/views/partials/incidents.blade.php
2015-09-04 11:53:25 +01:00
James Brooks 8a3f9196d3 Linking directly to an individual incident 2015-08-15 15:10:20 +01:00