lain a6d3bb5f30 Merge branch 'issue/1023' into 'develop' ... [#1023] added generated `pleroma.env` See merge request pleroma/pleroma!2763		2020-07-29 13:45:15 +00:00
..
mix	Merge branch 'issue/1023' into 'develop'	2020-07-29 13:45:15 +00:00
pleroma	Merge branch '1996-dont-break-on-chatmessages' into 'develop'	2020-07-29 12:20:04 +00:00
jason_types.ex	…
transports.ex	…
xml_builder.ex	…