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)
commit3e7bc943fe03dcd74666b6f26b3a831e06cac1d8
tree87124985edc861bd7ce5a9b8866db98ea8a71e86
parent2f28495d6b041c99536fe494c447c4e93fa79d16
parentd02e4ad461a4c6b41c7e7f0aeb6ce3e577b3424b
Merge remote-tracking branch 'upstream/pull/2120'
Gemfile
Gemfile.lock