David Yip 3550470c18 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.		2018-06-02 16:15:36 -05:00
..
admin
concerns
form
glitch
web
account.rb
account_domain_block.rb
account_filter.rb
account_moderation_note.rb
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb
custom_emoji_filter.rb	Change custom emoji search to ILIKE instead of = (#7099)	2018-04-10 15:46:27 +02:00
domain_block.rb
email_domain_block.rb
export.rb
favourite.rb
feed.rb
follow.rb	Store URIs of follows, follow requests and blocks for ActivityPub (#7160)	2018-05-04 21:14:34 +02:00
follow_request.rb
glitch.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
media_attachment.rb
mention.rb
mute.rb
notification.rb
preview_card.rb
remote_follow.rb
remote_profile.rb
report.rb
report_filter.rb
report_note.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb
status_pin.rb
stream_entry.rb
subscription.rb
tag.rb
trending_tags.rb
user.rb
web.rb