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
..
admin	…
concerns	…
form	…
web	…
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
account_alias.rb	…
account_conversation.rb	…
account_domain_block.rb	…
account_filter.rb	…
account_identity_proof.rb	…
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	…
announcement.rb	…
announcement_filter.rb	…
announcement_mute.rb	…
announcement_reaction.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	…
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
marker.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
mention.rb	…
mute.rb	…
notification.rb	…
poll.rb	…
poll_vote.rb	…
preview_card.rb	…
relationship_filter.rb	…
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
status_pin.rb	…
status_stat.rb	…
tag.rb	…
tag_filter.rb	…
tombstone.rb	…
trending_tags.rb	…
user.rb	…
user_invite_request.rb	…
web.rb	…