This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/admin/custom_emojis
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 Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
index.html.haml Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
new.html.haml Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc (#1763) 2022-05-05 19:11:56 +02:00