Merge remote-tracking branch 'upstream/pull/2107'
authorTom Hughes <tom@compton.nu>
Wed, 9 Jan 2019 17:20:08 +0000 (17:20 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 9 Jan 2019 17:20:08 +0000 (17:20 +0000)
commit74e1d7336ef926d4c3ef986abd8b899a7c4b6704
treed6fb334cdb1ea80fae8fd6d4facbbc624aad525b
parent09b6560e81f56712c6241c7f525df45daf7580c5
parent73201ca96be48a5113283709904ac29a6fee9cc8
Merge remote-tracking branch 'upstream/pull/2107'
app/abilities/ability.rb