09c61e1376
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. |
||
|---|---|---|
| .. | ||
| action_dispatch | ||
| active_record | ||
| assets | ||
| chewy/strategy | ||
| devise | ||
| generators | ||
| json_ld | ||
| mastodon | ||
| paperclip | ||
| rails | ||
| redis | ||
| sanitize_ext | ||
| tasks | ||
| templates | ||
| terrapin | ||
| webpacker | ||
| cli.rb | ||
| enumerable.rb | ||
| exceptions.rb | ||
| sidekiq_error_handler.rb | ||