Merge remote-tracking branch 'upstream/pull/2106'
authorTom Hughes <tom@compton.nu>
Wed, 9 Jan 2019 17:16:01 +0000 (17:16 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 9 Jan 2019 17:16:01 +0000 (17:16 +0000)
1  2 
app/abilities/ability.rb
app/abilities/capability.rb

Simple merge
Simple merge