Haelwenn 79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' ...

migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403

2020-04-18 06:59:23 +00:00

..

mix

Merge branch 'feature/1584-client-captcha-options' into 'develop'

2020-04-17 09:19:35 +00:00

pleroma

Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'

2020-04-18 06:59:23 +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