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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
about	Revert Font Awesome 5 upgrade (#8810)	6 years ago
accounts	Refactor active_nav_class for use with multiple paths (#8757)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	…
application	…
auth	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
authorize_interactions	…
errors	…
filters	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
follower_accounts	…
following_accounts	…
home	…
invites	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
kaminari	…
layouts	Revert Font Awesome 5 upgrade (#8810)	6 years ago
media	…
notification_mailer	…
oauth	…
remote_follow	…
remote_interaction	…
remote_unfollows	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	…
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	…
user_mailer	…
well_known	…