projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
65e8d47
6cbfb5a
)
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
author
kaniini
<nenolod@gmail.com>
Thu, 30 Aug 2018 23:06:30 +0000
(23:06 +0000)
committer
kaniini
<nenolod@gmail.com>
Thu, 30 Aug 2018 23:06:30 +0000
(23:06 +0000)
use media proxy for the suggestions api
See merge request pleroma/pleroma!305
1
2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge