luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-19 22:16:48 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/custom_emojis
History
Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
  We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
2022-06-11 00:08:41 +02:00
..
_custom_emoji.html.haml
index.html.haml
new.html.haml