Merge remote-tracking branch 'upstream/pull/2207'
authorTom Hughes <tom@compton.nu>
Wed, 26 Jun 2019 13:30:30 +0000 (14:30 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 26 Jun 2019 13:30:30 +0000 (14:30 +0100)
1  2 
app/controllers/api/users_controller.rb
app/models/trace.rb
test/controllers/api/traces_controller_test.rb

Simple merge