Petko Bordjukov 42582f79b3 Just return the array of conflicts		2016-10-12 23:18:35 +03:00
..
show.json.jbuilder	Just return the array of conflicts	2016-10-12 23:18:35 +03:00