]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4b7e436 a0d4129)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sun, 26 Sep 2021 16:28:59 +0000 (18:28 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Sun, 26 Sep 2021 16:28:59 +0000 (18:28 +0200)
commit36221107784ad26735ca2703d4d597c90eacf526
treeb52d1ee733383b3e702fe1562bd9962724fde8f5tree | snapshot
parent4b7e43602691193b5d2a8e7e0ed6044bc8ee9774commit | diff
parenta0d4129893c797f78d28ba9df5d35646f7bb0d80commit | 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.
app/controllers/home_controller.rb diff1 | diff2 | blob | history
app/javascript/mastodon/actions/compose.js diff1 | diff2 | blob | history
streaming/index.js diff1 | diff2 | blob | history
source code fur Kibicat Mastodon