projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cdbd91 cd93aa2)
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 17 Sep 2020 14:14:20 +0000 (17:14 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 17 Sep 2020 14:14:20 +0000 (17:14 +0300)
1  2 
lib/pleroma/web/mastodon_api/views/status_view.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history
test/web/mastodon_api/views/account_view_test.exs patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/web/router.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git