luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-29 13:38:48 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
2023-03-05 20:46:56 +01:00
..
core [Glitch] Run eslint --fix 2023-02-03 20:52:07 +01:00
flavours New Crowdin updates (#2118) 2023-03-05 20:38:18 +01:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00