You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		6 years ago
..
account_actions	…
account_moderation_notes	…
account_warnings	…
accounts	…
action_logs	…
change_emails	…
custom_emojis	…
dashboard	…
domain_blocks	…
email_domain_blocks	…
followers	…
instances	…
invites	…
pending_accounts	…
relays	…
report_notes	…
reports	…
settings	…
statuses	…
subscriptions	…
tags	…
warning_presets	…