projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6384d78 85d71d4)
Merge branch 'poll-notification' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 9 Aug 2021 10:02:37 +0000 (10:02 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 9 Aug 2021 10:02:37 +0000 (10:02 +0000)
MastodonAPI: Support poll notification

See merge request pleroma/pleroma!3484

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
config/config.exs patch | diff1 | diff2 | blob | history
test/support/factory.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc test/support/factory.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git