mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-28 13:47:23 +00:00
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.
This commit is contained in:
@@ -2,12 +2,12 @@
|
||||
pack:
|
||||
admin:
|
||||
- admin.tsx
|
||||
- public.jsx
|
||||
auth: public.jsx
|
||||
- public.tsx
|
||||
auth: public.tsx
|
||||
common:
|
||||
filename: common.js
|
||||
stylesheet: true
|
||||
embed: public.jsx
|
||||
embed: public.tsx
|
||||
error: error.js
|
||||
home:
|
||||
filename: application.js
|
||||
@@ -17,8 +17,8 @@ pack:
|
||||
- features/notifications
|
||||
mailer:
|
||||
modal:
|
||||
public: public.jsx
|
||||
settings: public.jsx
|
||||
public: public.tsx
|
||||
settings: public.tsx
|
||||
sign_up: sign_up.js
|
||||
share: share.jsx
|
||||
|
||||
|
||||
Reference in New Issue
Block a user