]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Mon, 27 Dec 2021 14:16:18 +0000 (15:16 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Mon, 27 Dec 2021 14:16:18 +0000 (15:16 +0100)
commit09c61e13767f7b77618949f422f229b638381088
tree4729cdeb166e05b4e8b6e594be3f8487378aacad
parent3b9a6049adf3ee6844a81622c297dd893836f79d
parentfe71548844715d796b9a6d2dd5234f70cf080f13
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  We have completely different contents. Kept our version.
- `package.json`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `streaming/index.js`:
  Conflict due to code style changes on parts that were
  modified in glitch-soc to handle local-only toots.
  Changed style according to upstream.
Gemfile
Gemfile.lock
app/models/user.rb
package.json
streaming/index.js
yarn.lock