Ivan Tashkinov 0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ...

# Conflicts:
#	config/config.exs

2020-02-20 15:00:48 +03:00

..

mix

Fix email mix task on OTP releases

2020-02-09 03:27:29 +03:00

pleroma

Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

2020-02-20 15:00:48 +03:00

jason_types.ex

…

transports.ex

…

xml_builder.ex

…