projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
14054dd
971bb4f
)
Merge branch 'feature/article-support' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Thu, 12 Jul 2018 05:58:39 +0000
(
05:58
+0000)
committer
lambda
<pleromagit@rogerbraun.net>
Thu, 12 Jul 2018 05:58:39 +0000
(
05:58
+0000)
article support (plume, etc)
See merge request pleroma/pleroma!240
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