projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
009273f
61d6715
)
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
author
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Tue, 29 Jan 2019 05:11:08 +0000
(
05:11
+0000)
committer
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Tue, 29 Jan 2019 05:11:08 +0000
(
05:11
+0000)
Rich Media support, part 2.
See merge request pleroma/pleroma!719
1
2
lib/pleroma/web/mastodon_api/views/status_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/views/status_view.ex
Simple merge