From: Ivan Tashkinov Date: Sat, 14 Mar 2020 12:37:02 +0000 (+0300) Subject: Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan... X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ecb7809e92b8ee6ac8f4b4a812673684e762c215;p=akkoma Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex --- ecb7809e92b8ee6ac8f4b4a812673684e762c215