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 aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml		5 years ago
..
about	…
accounts	…
admin	…
admin_mailer	…
application	…
auth	…
authorize_interactions	…
directories	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	…
media	…
notification_mailer	…
oauth	…
public_timelines	…
relationships	…
remote_follow	…
remote_interaction	…
remote_unfollows	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shared	…
shares	…
stream_entries	…
tags	…
user_mailer	…
well_known	…