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 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		6 years ago
..
about	…
accounts	Rename hide_followers_count helper to hide_followers_count?	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	…
application	Escape HTML in profile name preview in profile settings (#9446)	6 years ago
auth	Change the password form order (#9267)	6 years ago
authorize_interactions	…
directories	Rename hide_followers_count helper to hide_followers_count?	6 years ago
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Restore oops.gif animation for user who have auto_play_gif set	6 years ago
media	…
notification_mailer	Improve e-mail digest (#9689)	6 years ago
oauth	…
remote_follow	…
remote_interaction	…
remote_unfollows	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	Fix form validation flash message color and input borders (#9235)	6 years ago
shares	…
stream_entries	Display a double reply arrow on public pages for toots that are replies	6 years ago
tags	…
user_mailer	Add REST API for creating an account (#9572)	6 years ago
well_known	…