projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d031b18 1490016)
Merge branch 'chore/elixir-1.11' into 'develop'
authorfeld <feld@feld.me>
Thu, 22 Oct 2020 20:33:52 +0000 (20:33 +0000)
committerfeld <feld@feld.me>
Thu, 22 Oct 2020 20:33:52 +0000 (20:33 +0000)
Elixir 1.11 compatibility / Phoenix 1.5+

See merge request pleroma/pleroma!3059

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

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