mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 14:45:12 +01:00
b61c3ddff8
Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
views | ||
schema.rb | ||
seeds.rb |