Douwe Maan 7fc51d1908 Merge branch 'health-check-route' ... # Conflicts: # db/schema.rb		2016-05-12 16:39:03 -05:00
..
fixtures	Limit the number of merge requests per project to avoid long seeds	2016-05-04 09:22:01 -07:00
migrate	Merge branch 'health-check-route'	2016-05-12 16:39:03 -05:00
schema.rb	Merge branch 'health-check-route'	2016-05-12 16:39:03 -05:00
seeds.rb