Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs		2020-07-19 20:05:37 +03:00
..
mix	Merge branch 'develop' into refactor/notification_settings	2020-07-13 13:32:21 -05:00
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-19 20:05:37 +03:00
jason_types.ex
transports.ex
xml_builder.ex