fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-29 12:03:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
2022-05-11 09:37:48 +02:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
flavours [Glitch] Fix streaming notifications not using quick filter logic 2022-05-08 21:05:56 +02:00
fonts
images Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
packs Pre-fill domain block/allow domain from search filter (#18172) 2022-04-29 00:24:44 +02:00
skins
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00