Thibaut Girka a01674fb2b Merge branch 'master' into glitch-soc/merge-upstream

2020-06-26 13:02:14 +02:00

..

_custom_emoji.html.haml

Fix not showing if emoji has a local counterpart in admin UI (#12135)

2019-10-10 02:21:52 +02:00

index.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2020-06-26 13:02:14 +02:00

new.html.haml

…