Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-25 11:56:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether.
This commit is contained in:
Claire
2023-09-02 13:14:54 +02:00
parent fbbe9f1c12 0719216368
commit 6ee3e382df
4 changed files with 11 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/core/theme.yml
View File

@@ -13,8 +13,8 @@ pack:
mailer:
filename: mailer.js
stylesheet: true
modal: public.js
public: public.js
modal:
public:
settings: settings.js
sign_up:
share: