projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bab786c
d56bc62
)
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
author
lain
<lain@soykaf.club>
Mon, 4 Nov 2019 14:11:44 +0000
(14:11 +0000)
committer
lain
<lain@soykaf.club>
Mon, 4 Nov 2019 14:11:44 +0000
(14:11 +0000)
Store status data inside flag activity
See merge request pleroma/pleroma!1849
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/transmogrifier_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/common_api/common_api_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
test/web/activity_pub/activity_pub_test.exs
Simple merge
diff --cc
test/web/activity_pub/transmogrifier_test.exs
Simple merge
diff --cc
test/web/common_api/common_api_test.exs
Simple merge