Merge remote-tracking branch 'upstream/pull/1926'
authorTom Hughes <tom@compton.nu>
Wed, 28 Aug 2019 16:23:10 +0000 (17:23 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 28 Aug 2019 16:23:10 +0000 (17:23 +0100)
commit783b5e3729228908d7404ae7404af1023501a906
tree223b5dab4d748ddf7af75a4850e7c61f26080d66
parenta7092491b069de43bb8d8c30d3526e7095c5cc98
parente71d7e8bea5b4f2b67fe4a6bee94a24bacbcb3e5
Merge remote-tracking branch 'upstream/pull/1926'
app/controllers/api/notes_controller.rb
app/views/browse/note.html.erb
test/controllers/api/notes_controller_test.rb