projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4b4258 f2134e6)
Merge branch 'cycles-base-url' into 'develop'
authorfeld <feld@feld.me>
Tue, 1 Jun 2021 16:15:27 +0000 (16:15 +0000)
committerfeld <feld@feld.me>
Tue, 1 Jun 2021 16:15:27 +0000 (16:15 +0000)
Deprecate Pleroma.Web.base_url/0

See merge request pleroma/pleroma!3432

1  2 
lib/pleroma/web/activity_pub/utils.ex patch | diff1 | diff2 | blob | history
test/pleroma/web/common_api_test.exs patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge
diff --cc test/pleroma/web/common_api_test.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git