Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ... - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.		2021-05-07 18:21:59 +02:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
api
auth
concerns
oauth
settings	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-06 18:08:06 +01:00
well_known
about_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
account_follow_controller.rb	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
account_unfollow_controller.rb
accounts_controller.rb
application_controller.rb
authorize_interactions_controller.rb
custom_css_controller.rb
directories_controller.rb
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb
health_controller.rb
home_controller.rb
instance_actors_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
public_timelines_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
relationships_controller.rb
remote_follow_controller.rb
remote_interaction_controller.rb
shares_controller.rb
statuses_controller.rb
tags_controller.rb