Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 14 Mar 2020 12:37:02 +0000 (15:37 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 14 Mar 2020 12:37:02 +0000 (15:37 +0300)
commitecb7809e92b8ee6ac8f4b4a812673684e762c215
treefa00baa27456d77a61440833f85c5143620e4ad2
parentbd40880fa0ed328c2948bb145354a8292fe051b5
parent14ebf8f1e5411337d63d6372e6229da1b2f28316
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions

# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex