about summary refs log tree commit diff
path: root/app/javascript/flavours
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-09-26 18:28:59 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-09-26 18:28:59 +0200
commit36221107784ad26735ca2703d4d597c90eacf526 (patch)
treeb52d1ee733383b3e702fe1562bd9962724fde8f5 /app/javascript/flavours
parent4b7e43602691193b5d2a8e7e0ed6044bc8ee9774 (diff)
parenta0d4129893c797f78d28ba9df5d35646f7bb0d80 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `streaming/index.js`:
  Filtering code for streaming notifications has been refactored upstream, but
  glitch-soc had similar code for local-only toots in the same places.
  Ported upstream changes, but did not refactor local-only filtering.
Diffstat (limited to 'app/javascript/flavours')
0 files changed, 0 insertions, 0 deletions