luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-11-19 14:43:43 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream 
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`.
2022-06-11 00:08:41 +02:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
flavours [Glitch] Add administrative webhooks 2022-06-10 17:04:02 +02:00
fonts
icons Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
packs Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
skins Glitchsoc translation to 'es' language (#1439) 2020-10-19 22:17:29 +02:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00