mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/views/admin/custom_emojis
History
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
 		2023-07-30 16:11:55 +02:00
..
_custom_emoji.html.haml Add role badges to the WebUI (#25649) 2023-07-27 16:05:24 +02:00
index.html.haml Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02: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