mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-27 10:58:33 +00:00
b2915613fb
Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
views | ||
schema.rb | ||
seeds.rb |