You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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.
4 years ago
..
about.js Change how CDN_HOST is passed down to make assets build reproducible (#14381) 5 years ago
admin.js [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 4 years ago
application.js Change how CDN_HOST is passed down to make assets build reproducible (#14381) 5 years ago
common.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 5 years ago
error.js Change how CDN_HOST is passed down to make assets build reproducible (#14381) 5 years ago
public-path.js Change how CDN_HOST is passed down to make assets build reproducible (#14381) 5 years ago
public.js Merge branch 'main' into glitch-soc/merge-upstream 4 years ago
share.js Change how CDN_HOST is passed down to make assets build reproducible (#14381) 5 years ago