gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-12-11 19:12:42 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
b0139dcf5e
mastodon/app/views/admin/custom_emojis
History
Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
2020-01-20 18:31:11 +01: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-01-20 18:31:11 +01:00
new.html.haml Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00