mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 08:25:55 +00:00
a6fb1c58ee
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb |
||
---|---|---|
.. | ||
fonts | ||
mastodon | ||
application.scss | ||
mailer.scss | ||
win95.scss |