feld bf3afbc1a1 Merge branch 'logger-configuration' into 'develop' ... Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365		2020-04-14 15:11:25 +00:00
..
mix	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	2020-04-13 09:16:51 +03:00
pleroma	Merge branch 'logger-configuration' into 'develop'	2020-04-14 15:11:25 +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