This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript
Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
2023-09-21 15:12:00 +02:00
..
core Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
flavours [Glitch] Fix Web UI making duplicate search queries when scrolling 2023-09-18 12:12:55 +02:00
fonts
hooks
icons
images Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-09-21 15:12:00 +02:00
packs Improve interaction modal error handling (#26795) 2023-09-05 23:49:48 +02:00
skins
styles Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 2023-09-15 21:43:49 +02:00
types Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00