fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-28 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/admin/trends/links
History
Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.

Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`
2021-11-25 23:50:35 +01:00
..
preview_card_providers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
_preview_card.html.haml
index.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00