tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
c79a03b319
mastodon/app/views/admin/trends/links
History
Claire c79a03b319 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
2022-03-15 20:45:27 +01:00
..
preview_card_providers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 20:48:27 +01:00
_preview_card.html.haml Fix individually approved/rejected statuses/links showing as pending review (#17787) 2022-03-15 07:51:55 +01:00
index.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 20:48:27 +01:00