Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		2018-08-27 18:09:28 +02:00
..
activitypub	…
admin	Add confirmation step to account suspensions (#8353)	2018-08-22 11:53:41 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
auth	…
concerns	Update Rails (#8141)	2018-08-13 18:17:20 +02:00
oauth	…
settings	Migrate glitch-soc keyword mutes to Mastodon's	2018-07-09 19:19:23 +02:00
well_known	…
about_controller_spec.rb	Compensate for scrollbar disappearing when media modal visible (#8100)	2018-07-31 01:14:33 +02:00
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	…
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
authorize_interactions_controller_spec.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
home_controller_spec.rb	…
intents_controller_spec.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
remote_follow_controller_spec.rb	…
remote_unfollows_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	…
stream_entries_controller_spec.rb	…
tags_controller_spec.rb	…