fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-11 13:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
flavours Fix react warning on notifications column (#1832) 2022-08-27 15:17:27 +02:00
fonts
icons Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-06-21 08:28:59 +02:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
packs Add ability to select all accounts matching search for batch actions (#19053) 2022-08-25 23:33:34 +02:00
skins
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00