mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-12 18:03:03 +00:00
d8fdbb054e
Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes. |
||
|---|---|---|
| .. | ||
| action_dispatch | ||
| assets | ||
| chewy/strategy | ||
| devise | ||
| generators | ||
| json_ld | ||
| mastodon | ||
| paperclip | ||
| rails | ||
| redis | ||
| tasks | ||
| templates | ||
| webpacker | ||
| cli.rb | ||
| enumerable.rb | ||