Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex		2020-07-02 16:36:54 +03:00
..
mix	Merge develop	2020-06-23 20:56:55 +03:00
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-02 16:36:54 +03:00
jason_types.ex
transports.ex
xml_builder.ex