rinpatch 8c3241df44 Merge branch 'fix/2047-rich-media-parser' into 'develop' ... RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941		2020-09-08 13:00:15 +03:00
..
mix	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads	2020-08-25 11:44:51 +02:00
pleroma	Merge branch 'fix/2047-rich-media-parser' into 'develop'	2020-09-08 13:00:15 +03: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