Douwe Maan 7fc51d1908 Merge branch 'health-check-route' ... # Conflicts: # db/schema.rb		2016-05-12 16:39:03 -05:00
..
admin_routing_spec.rb	…
notifications_routing_spec.rb	…
project_routing_spec.rb	…
routing_spec.rb	Merge branch 'health-check-route'	2016-05-12 16:39:03 -05:00