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 b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.		2020-07-22 13:38:17 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-22 13:38:17 +02:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-30 23:00:20 +02:00
well_known	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-20 18:22:42 +02:00
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-22 13:38:17 +02:00
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +02:00
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	Fix functional user requirements in whitelist mode (#14093)	2020-06-19 19:18:47 +02:00
media_proxy_controller.rb	Fix media attachments enumeration (#14254)	2020-07-07 15:26:51 +02:00
public_timelines_controller.rb	…
relationships_controller.rb	…
remote_follow_controller.rb	…
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
shares_controller.rb	…
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00