mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 09:34:16 -05:00
9a3d91f629
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
seeds | ||
views | ||
schema.rb | ||
seeds.rb |