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
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.
5 years ago
..
core Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
flavours Use “public.js” pack for auth pages for form validation helpers 5 years ago
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
packs Add ability to require invite request text (#15326) 5 years ago
skins Glitchsoc translation to 'es' language (#1439) 5 years ago
styles Merge branch 'master' into glitch-soc/merge-upstream 5 years ago