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
..
activitypub	…
admin	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
auth	Check that an invite link is valid before bypassing approval mode (#10657)	2019-05-02 04:30:12 +02:00
concerns	…
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
well_known	…
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	…
application_controller_spec.rb	…
authorize_interactions_controller_spec.rb	…
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
home_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
relationships_controller_spec.rb	…
remote_follow_controller_spec.rb	…
remote_interaction_controller_spec.rb	…
remote_unfollows_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	…
stream_entries_controller_spec.rb	…
tags_controller_spec.rb	…