lain a6c14041c4 Merge branch 'develop' into 'issue/1975' ... # Conflicts: # CHANGELOG.md		2020-09-23 09:16:00 +00:00
..
mix	Deny ConfigDB migration when deprecated settings found	2020-09-17 09:32:50 -05:00
pleroma	Merge branch 'develop' into 'issue/1975'	2020-09-23 09:16:00 +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