Merge remote-tracking branch 'upstream/pull/2120'
authorTom Hughes <tom@compton.nu>
Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)
1  2 
Gemfile
Gemfile.lock

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