Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	config/locales/simple_form.ja.yml

2018-05-19 22:41:10 +02:00

..

admin

…

concerns

…

form

…

glitch

…

web

Ensure push subscription is immediately removed when application is revoked (#7548)

2018-05-19 21:05:08 +02:00

account_domain_block.rb

…

account_filter.rb

…

account_moderation_note.rb

…

account.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-05-18 08:47:10 -05:00

admin.rb

…

application_record.rb

…

backup.rb

…

block.rb

…

bookmark.rb

…

context.rb

…

conversation_mute.rb

…

conversation.rb

…

custom_emoji_filter.rb

…

custom_emoji.rb

…

domain_block.rb

…

email_domain_block.rb

…

export.rb

…

favourite.rb

…

feed.rb

…

follow_request.rb

…

follow.rb

…

glitch.rb

…

home_feed.rb

…

identity.rb

…

import.rb

…

instance_filter.rb

…

instance.rb

…

invite_filter.rb

…

invite.rb

…

list_account.rb

…

list_feed.rb

…

list.rb

…

media_attachment.rb

…

mention.rb

…

mute.rb

…

notification.rb

…

preview_card.rb

…

remote_follow.rb

…

remote_profile.rb

…

report_filter.rb

…

report_note.rb

…

report.rb

…

search.rb

…

session_activation.rb

…

setting.rb

…

site_upload.rb

…

status_pin.rb

…

status.rb

…

stream_entry.rb

…

subscription.rb

…

tag.rb

…

user.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-05-18 08:47:10 -05:00

web.rb

…