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)
commit7441f15b4fd59735ae00a16b47cfcf7eb99260a6
tree74d7cf45a8383bcdfc2b76a690bb93d485d32607
parentd5672aed4a40af96431ac19e77574813f0a7a2e1
parent27679356af01e771324ef7b03919e3e9e803c20a
Merge remote-tracking branch 'upstream/pull/1576'
Gemfile
Gemfile.lock