Merge remote-tracking branch 'upstream/pull/2186'
authorTom Hughes <tom@compton.nu>
Sat, 23 Mar 2019 12:01:05 +0000 (12:01 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 23 Mar 2019 12:01:05 +0000 (12:01 +0000)
commit951564eed1c82ec1a435f4e4636db86d1b7604fc
tree331e5dcb18314da4e30f0cdcd0f621419a8d2d5c
parentcba7945a5b409222301f7512e648866810cae4d9
parent19c2f6d485baf6ae5986a9eeaed412cb2e2039a1
Merge remote-tracking branch 'upstream/pull/2186'
app/controllers/api_controller.rb
app/controllers/application_controller.rb