Haelwenn f918b6f86d Merge branch '1937-renaming' into 'develop' ... ActivityPub: Don't rename a clashing nickname with the same ap id. Closes #1937 See merge request pleroma/pleroma!2748		2020-07-13 12:06:43 +00:00
..
mix	Merge branch 'mix-tasks-improvement' into 'develop'	2020-07-10 08:58:44 +00:00
pleroma	Merge branch '1937-renaming' into 'develop'	2020-07-13 12:06:43 +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