luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-27 20:38:53 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 1a664560cc Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  We deleted it.
  Kept it removed.
- `app/javascript/packs/public.jsx`:
  Upstream changed an import, we have slightly different ones.
  Ported upstream changes.
2023-05-09 23:12:48 +02:00
..
core [Glitch] Dont use CommonJS (require, module.exports) anywhere 2023-05-09 22:28:53 +02:00
flavours Disable broken onboarding code 2023-05-09 23:03:23 +02:00
fonts
hooks
icons
images Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
locales
mastodon Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream 2023-05-09 23:12:48 +02:00
packs Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream 2023-05-09 23:12:48 +02:00
skins
styles Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
types Add more detailed type annotation for Account (#24815) 2023-05-09 12:09:32 +02:00