mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-30 20:27:18 +00:00
e71b16ae2b
Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies. |
||
---|---|---|
.. | ||
assets | ||
chewy/strategy | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
redis | ||
tasks | ||
templates | ||
webpacker | ||
cli.rb |