projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be800d7
b670d4d
)
Merge branch 'features/column_media_streaming' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Tue, 19 Jun 2018 09:50:05 +0000
(09:50 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Tue, 19 Jun 2018 09:50:05 +0000
(09:50 +0000)
Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge