diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-12-27 15:16:18 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-12-27 15:16:18 +0100 |
| commit | 09c61e13767f7b77618949f422f229b638381088 (patch) | |
| tree | 4729cdeb166e05b4e8b6e594be3f8487378aacad /app/javascript/flavours/glitch/features | |
| parent | 3b9a6049adf3ee6844a81622c297dd893836f79d (diff) | |
| parent | fe71548844715d796b9a6d2dd5234f70cf080f13 (diff) | |
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.
Diffstat (limited to 'app/javascript/flavours/glitch/features')
0 files changed, 0 insertions, 0 deletions