This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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		2019-06-24 15:02:59 +02:00
..
account_actions	…
account_moderation_notes	…
account_warnings	…
accounts	Add batch actions for approving and rejecting pending accounts (#10469)	2019-04-06 17:53:45 +02:00
action_logs	Use local time in audit log (#10751)	2019-05-11 06:46:01 +02:00
change_emails	…
custom_emojis	…
dashboard	Fix keybase indication on dashboard	2019-04-19 00:57:39 +02:00
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
email_domain_blocks	…
followers	…
instances	Remove expensive counters from federation page in admin UI (#11139)	2019-06-22 00:39:09 +02:00
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	2019-03-15 05:35:17 +01:00
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
relays	…
report_notes	…
reports	…
settings	Add label for admin theme selector (#11121)	2019-06-19 17:30:08 +02:00
statuses	…
subscriptions	…
tags	…
warning_presets	…