Ivan Tashkinov e7fb593d13 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md		2020-04-22 20:00:51 +03:00
..
mix	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users	2020-04-22 20:00:51 +03:00
jason_types.ex
transports.ex
xml_builder.ex