mastodon/app/javascript/packs
Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
2022-10-30 18:15:28 +01:00
..
admin.js Change admin announcement edition interface to use datetime-local (#18321) 2022-10-28 12:56:32 +02:00
application.js Fix missing await (#19273) 2022-10-03 23:08:38 +02:00
common.js
error.js
public-path.js
public.js Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
share.js