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 c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
7 years ago
..
core Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
flavours Make headers font size proportional 7 years ago
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
locales Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
packs Animate avatar GIFs on-hover on public profiles (#10549) 7 years ago
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 7 years ago