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 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	…
application	…
auth	…
authorize_interactions	…
directories	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	…
notification_mailer	…
oauth	…
public_timelines	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
relationships	…
remote_follow	…
remote_interaction	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	…
shares	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
statuses	…
tags	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
user_mailer	…
well_known/host_meta	…