mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-12 06:06:22 +01:00
4c1fd9a19c
Conflicts: app/javascript/styles/mastodon/components.scss |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |