Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,185 Commits 74 Branches 58 Tags
ccf2f2cb75d6f5a307b5b82b3ee445b1cabbaad5
Commit Graph

2 Commits

Author SHA1 Message Date
Claire
1b06e4e1b7 Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  In glitch-soc, this file was split across the following files:
  - `app/javascript/packs/public.jsx`
  - `app/javascript/core/embed.js`
  - `app/javascript/core/settings.js`
  Update all those files accordingly, as well as the related `theme.yml` files.
 2024-03-15 22:37:55 +01:00
Renaud Chaput
c76ae7a5c0 Convert packs/public.jsx to Typescript (#29501) 2024-03-15 13:16:45 +00:00