Merge remote-tracking branch 'upstream/pull/2038'
authorTom Hughes <tom@compton.nu>
Sat, 3 Nov 2018 11:58:56 +0000 (11:58 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 3 Nov 2018 11:58:56 +0000 (11:58 +0000)
1  2 
.rubocop_todo.yml

Simple merge