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	Cleanup various controllers (#10972)	2019-06-05 14:02:59 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
auth	…
concerns	Cleanup various controllers (#10972)	2019-06-05 14:02:59 +02:00
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
well_known	…
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
authorize_interactions_controller.rb	…
custom_css_controller.rb	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +02:00
directories_controller.rb	…
emojis_controller.rb	Cleanup various controllers (#10972)	2019-06-05 14:02:59 +02:00
filters_controller.rb	…
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
home_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +02:00
media_controller.rb	Add audio uploads (#11123)	2019-06-19 23:42:38 +02:00
media_proxy_controller.rb	Change domain blocks to automatically support subdomains (#11138)	2019-06-22 00:13:10 +02:00
public_timelines_controller.rb	…
relationships_controller.rb	…
remote_follow_controller.rb	…
remote_interaction_controller.rb	…
remote_unfollows_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
stream_entries_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
tags_controller.rb	…