mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-05-23 07:31:13 +00:00
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb |
||
---|---|---|
.. | ||
fonts | ||
mastodon | ||
application.scss | ||
mailer.scss | ||
win95.scss |