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 59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
5 years ago
..
core Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
flavours [Glitch] Fix WebUI crash when loading account data before page is loaded 5 years ago
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
locales Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
packs Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
skins Port Sylvhem's mastodon-light to glitch flavour 7 years ago
styles Merge branch 'master' into glitch-soc/merge-upstream 5 years ago