Merge remote-tracking branch 'upstream/pull/2109'
authorTom Hughes <tom@compton.nu>
Wed, 9 Jan 2019 17:27:16 +0000 (17:27 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 9 Jan 2019 17:27:16 +0000 (17:27 +0000)
commit6c2432ae423c6744b8443c63d0e02e1ccc2d3011
treec402169444ceb02dd37ae9b021bd1cc71ca7a6e0
parent73fe5a13df75ffbe12002fbd7ebc71744d2ae07b
parentb184b39f344b7298370c246d8f45d10f48d01a7e
Merge remote-tracking branch 'upstream/pull/2109'
app/abilities/ability.rb