Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		2019-10-10 17:26:08 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
accounts
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
admin_mailer	Fixed not being able to display review pending hashtags in the admin UI. (#11875)	2019-09-17 16:59:16 +02:00
application	Remove fallback to long description on sidebar and meta description (#12119)	2019-10-08 22:08:55 +02:00
auth	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +02:00
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home
invites	Remove invite comments from UI (#12068)	2019-10-03 22:37:13 +02:00
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
shared	Remove fallback to long description on sidebar and meta description (#12119)	2019-10-08 22:08:55 +02:00
shares
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
tags
user_mailer	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
well_known/host_meta