rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Closes #1695 See merge request pleroma/pleroma!2398		2020-04-17 13:40:25 +00:00
..
mix	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
pleroma	Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'	2020-04-17 13:40:25 +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