Merge remote-tracking branch 'upstream/pull/2116'
authorTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 10:23:27 +0000 (10:23 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 10:23:27 +0000 (10:23 +0000)
commit11806a676fb88f51ece004b7c05bde38f1e77706
tree8dde680a575575f2b35927422de8cbf0c5e48df9
parentd2e11a327eb686bd2d1293ac146a2bb9730ba19b
parent3e49e4a62ad9ccce7a193ab0393a7722896455aa
Merge remote-tracking branch 'upstream/pull/2116'
app/abilities/ability.rb