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/core
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
4 years ago
..
admin.js Merge branch 'master' into glitch-soc/merge-upstream 4 years ago
auth.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 5 years ago
common.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 5 years ago
embed.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 5 years ago
mailer.js Fixed improper mailer import 7 years ago
public.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 5 years ago
settings.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 5 years ago
theme.yml Adapt 2FA changes to glitch-soc's theming system 5 years ago
two_factor_authentication.js [Glitch] Change how CDN_HOST is passed down to make assets build reproducible 5 years ago