David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		2018-04-18 18:48:12 -05:00
..
about	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-18 18:48:12 -05:00
accounts	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-18 18:48:12 -05:00
admin	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-18 18:48:12 -05:00
admin_mailer
application
auth
authorize_follows	Note if the user is already following the target when authorizing follow (#6325)	2018-03-24 12:50:41 +01:00
errors
follower_accounts
following_accounts
home
invites	Able to deactivate invites if they aren't expired (#7163)	2018-04-17 13:52:08 +02:00
kaminari
layouts
media
notification_mailer	Display content warning in mail notification emails (#6832)	2018-03-19 20:12:20 +01:00
oauth
remote_follow
remote_unfollows	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	2018-04-08 13:40:22 +02:00
settings	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-14 09:12:50 -05:00
shared
shares
stream_entries	Merge remote-tracking branch 'tootsuite/master'	2018-04-12 03:30:57 -05:00
tags
user_mailer
well_known