You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.		4 years ago
..
about	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
accounts	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
admin_mailer	…
application	…
auth	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
authorize_interactions	…
directories	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
media	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
notification_mailer	…
oauth	…
public_timelines	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
relationships	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
remote_follow	…
remote_interaction	…
settings	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
shared	…
shares	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
tags	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
user_mailer	…
well_known/host_meta	…