Ivan Tashkinov f00ff20768 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/following_relationship.ex		2020-04-13 09:23:50 +03:00
..
mix	Fix mix tasks failing on OTP releases	2020-04-12 18:49:31 +03:00
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users	2020-04-13 09:23:50 +03:00
jason_types.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
transports.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
xml_builder.ex	Update Copyrights	2020-03-03 16:44:49 -06:00