mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-07 15:34:55 +00:00
8ec4be4233
Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
views | ||
schema.rb | ||
seeds.rb |