rinpatch 67bde35e71 Merge branch 'bugfix/bridgy-user-icon' into 'develop' ... Add support for actor icon being a list (Bridgy) See merge request pleroma/pleroma!3372		2021-03-19 08:36:26 +00:00
..
mix	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-03-02 08:26:30 +03:00
phoenix/transports/web_socket	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
pleroma	Merge branch 'bugfix/bridgy-user-icon' into 'develop'	2021-03-19 08:36:26 +00:00