mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
![]() Conflicts: - `package.json`: Not a real conflict, upstream dependency updated textually too close to a glitch-soc-only dependency. Updated the upstream dependency. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
views | ||
schema.rb | ||
seeds.rb |