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
..
admin
concerns
form
web
account.rb
account_alias.rb
account_conversation.rb
account_domain_block.rb
account_filter.rb
account_identity_proof.rb	Fix Keybase verification using wrong domain for remote accounts (#10547)	2019-04-10 20:28:43 +02:00
account_migration.rb
account_moderation_note.rb
account_pin.rb
account_stat.rb
account_tag_stat.rb
account_warning.rb
account_warning_preset.rb
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
direct_feed.rb
domain_allow.rb
domain_block.rb
email_domain_block.rb
export.rb
favourite.rb
featured_tag.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
list.rb
list_account.rb
list_feed.rb
marker.rb
media_attachment.rb
mention.rb
mute.rb
notification.rb
poll.rb
poll_vote.rb
preview_card.rb	Fix preview card image not being re-fetched even if link is re-posted (#11981)	2019-09-28 01:33:16 +02:00
relay.rb
remote_follow.rb
report.rb
report_filter.rb
report_note.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb
status_pin.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
status_stat.rb
tag.rb
tag_filter.rb
tombstone.rb
trending_tags.rb
user.rb
user_invite_request.rb
web.rb