lain 96f7b1b140 Merge branch 'show-media-endpoint-fixes' into 'develop' ... MediaController OAuth scope assignments fix See merge request pleroma/pleroma!2541		2020-05-18 10:57:59 +00:00
..
mix	Merge branch 'restricted-relations-embedding' into 'develop'	2020-05-17 07:26:51 +00:00
pleroma	Merge branch 'show-media-endpoint-fixes' into 'develop'	2020-05-18 10:57:59 +00:00
jason_types.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
transports.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
xml_builder.ex	Update Copyrights	2020-03-03 16:44:49 -06:00