Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		2020-03-22 16:10:44 +01:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-23 19:03:01 +01:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-06 21:36:38 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
admin_mailer
application
auth	Fix invite request input not being shown on sign-up error if left empty (#13089)	2020-02-16 12:38:22 +01:00
authorize_interactions	Fix misleading error when attempting to re-send a pending follow request (#13133)	2020-02-24 21:19:19 +01:00
directories	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-27 15:46:50 +01:00
errors	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
filters	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
follower_accounts
following_accounts
home
invites
kaminari
layouts	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
media
notification_mailer
oauth
public_timelines
relationships	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-27 15:46:50 +01:00
remote_follow
remote_interaction
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
shared
shares
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-06 21:36:38 +01:00
tags
user_mailer
well_known/host_meta