mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 21:26:52 +00:00
a6fb1c58ee
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb |
||
---|---|---|
.. | ||
account_moderation_notes | ||
accounts | ||
action_logs | ||
custom_emojis | ||
domain_blocks | ||
email_domain_blocks | ||
instances | ||
invites | ||
reports | ||
settings | ||
statuses | ||
subscriptions |