luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-04 14:04:39 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/models/account.rb`:
  Textual conflict only caused by glitch-soc using a different value
  for character limits in a nearby line.
  Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
  Attribute added to a tag modified by glitch-soc.
  Added upstream's attributes.
- `yarn.lock`:
  Upstream added/updated dependencies close to glitch-soc-only ones.
  Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
..
core Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
flavours Translate: Korean (#1790) 2022-05-31 11:41:30 +02:00
fonts
images Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
packs Pre-fill domain block/allow domain from search filter (#18172) 2022-04-29 00:24:44 +02:00
skins
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00