Merge remote-tracking branch 'upstream/pull/1652'
authorTom Hughes <tom@compton.nu>
Wed, 25 Oct 2017 07:16:33 +0000 (08:16 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 25 Oct 2017 07:16:33 +0000 (08:16 +0100)
commit38640e0253e8984974d275f2c232eb057ba86c84
tree483ffded7f67428948ec843ad799d0ad61bbb941
parentf0b2ed9bb6c1e153231b8088eabe6e3edcee9420
parent29a780eb1af9ca5f8b55e53cf89701b297707607
Merge remote-tracking branch 'upstream/pull/1652'
Gemfile
Gemfile.lock