2016-10-12 21:51:36 +03:00

2 lines
41 B
Ruby

json.merge! @conflicts_summary.conflicts