mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-29 03:20:26 -05:00
abcba5c198
Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc. |
||
---|---|---|
.. | ||
assets | ||
chewy/strategy | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |