mastodon/app/javascript/packs
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
about.js
admin.js [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 21:45:01 +02:00
application.js
common.js
error.js
public-path.js
public.js Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
share.js