mirror of
https://github.com/mastodon/mastodon.git
synced 2025-10-25 10:11:26 +00:00
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb |
||
|---|---|---|
| .. | ||
| fonts | ||
| mastodon | ||
| application.scss | ||
| mailer.scss | ||
| win95.scss | ||