Haelwenn 4ac6e6283f Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix' ... # Conflicts: # CHANGELOG.md		2020-07-10 08:55:15 +00:00
..
mix	Use the Pleroma.Config alias	2020-07-09 10:53:51 -05:00
pleroma	Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'	2020-07-10 08:55:15 +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