Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.		2018-09-11 16:51:26 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-22 20:56:32 +02:00
accounts	Use animation config for avatar in profile pages (#8614)	2018-09-07 05:43:09 +02:00
admin	Allow to show a specific status in the admin interface	2018-09-03 18:19:11 +02:00
admin_mailer
application
auth	When registrations closed, link "Sign up" to joinmastodon.org (#8395)	2018-08-23 19:11:41 +02:00
authorize_interactions	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
media
notification_mailer
oauth
remote_follow
remote_interaction	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
remote_unfollows
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-03 14:33:06 +02:00
shared
shares
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-01 17:23:46 +02:00
tags
user_mailer
well_known	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00