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
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
6 years ago
..
core Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
flavours Minor cleanup 6 years ago
fonts Theme: Windows 95 7 years ago
images Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
locales Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
packs Put poll options behind content warnings (#10983) 6 years ago
skins Port Sylvhem's mastodon-light to glitch flavour 7 years ago
styles Merge branch 'master' into glitch-soc/merge-upstream 6 years ago