projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72189d2 3506e95)
Merge branch 'mastodon-migration-compat' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sun, 24 May 2020 19:05:57 +0000 (19:05 +0000)
committerrinpatch <rinpatch@sdf.org>
Sun, 24 May 2020 19:05:57 +0000 (19:05 +0000)
Add compatibility routes for converted mastodon instances

Closes #1797

See merge request pleroma/pleroma!2572

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/common_api/utils.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/web/common_api/utils.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git