Merge remote-tracking branch 'upstream/pull/1576'
authorTom Hughes <tom@compton.nu>
Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)
1  2 
Gemfile
Gemfile.lock

diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge