mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'c8181eb0a4' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
This commit is contained in:
Claire 2023-05-09 22:12:05 +02:00
commit c81d1b0d38
144 changed files with 266 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/core/mailer.js
View file

@ -1,3 +1,3 @@
require('../styles/mailer.scss');
import '../styles/mailer.scss';
require.context('../icons');