Mark Felder 7aec234b44 Remove Proxy settings that were not meant to exist under Pleroma.Upload		2020-12-23 17:01:11 -06:00
..
mix	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-12-17 09:05:36 -06:00
phoenix/transports/web_socket	Merge branch 'develop' into chore/elixir-1.11	2020-10-13 09:54:53 -05:00
pleroma	Remove Proxy settings that were not meant to exist under Pleroma.Upload	2020-12-23 17:01:11 -06:00
jason_types.ex	Update Copyrights	2020-03-03 16:44:49 -06:00