Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications ... # Conflicts: # CHANGELOG.md		2020-04-17 16:23:58 +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 1559-follow-request-notifications	2020-04-17 16:23:58 +03:00
jason_types.ex
transports.ex
xml_builder.ex