Haelwenn 0465bdbd49 Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' ... Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992		2020-09-17 19:50:23 +03:00
..
mix	Merge branch 'http-fixes' into 'develop'	2020-09-08 13:53:16 +03:00
pleroma	Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'	2020-09-17 19:50:23 +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