tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `README.md`:
  Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
  We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
This commit is contained in:
Claire
2022-06-10 22:25:36 +02:00
parent 970f06331b f09a66b9a7
commit 15929a3d59
112 changed files with 265 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/core/mailer.js
View File

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