mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-28 19:10:31 +00:00
b61c3ddff8
Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged. |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |