HomeSoftware Heritage

update branch from master, fix merge conflicts, fix rubocop style failures

Description

update branch from master, fix merge conflicts, fix rubocop style failures

Event Timeline

George Hansper <george@hansper.id.au> committed rSPPG9a5ffdb4e92f: update branch from master, fix merge conflicts, fix rubocop style failures (authored by George Hansper <george@hansper.id.au>).Mar 1 2018, 5:48 AM

Merged Changes