logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 049ece1ef38f1aeb656a88ed1d15bf3d4a364e01
parent 2498e569f12694439b6f99d0730f6fb36301c454
Author: Ivan Tashkinov <ivantashkinov@gmail.com>
Date:   Sat, 17 Oct 2020 13:12:39 +0300

Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

Diff is too large, output suppressed.