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)
1  2 
app/abilities/ability.rb

Simple merge