Haelwenn 353538d16c Merge branch 'pleroma-akkoma-emoji-port' into 'develop' ... Custom emoji reactions support See merge request pleroma/pleroma!3845		2023-03-16 08:00:00 +00:00
..
controllers	Merge branch 'tusooa/block-rel' into 'develop'	2023-03-09 13:13:14 +00:00
views	Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes	2023-03-12 11:39:17 +03:00
mastodon_api_controller_test.exs	Revert "Merge branch 'copyright-bump' into 'develop'"	2023-01-02 20:38:50 +00:00
mastodon_api_test.exs	Revert "Merge branch 'copyright-bump' into 'develop'"	2023-01-02 20:38:50 +00:00
update_credentials_test.exs	Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1	2023-03-01 20:09:50 -05:00