David Yip 4c1fd9a19c Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		2018-02-02 08:39:52 -06:00
..
about	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-02-02 08:39:52 -06:00
accounts	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
admin	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
admin_mailer	…
application	…
auth	pam authentication (#5303)	2018-02-02 10:18:55 +01:00
authorize_follows	Resolve URL for local account in follow authorization success view (#6324)	2018-01-22 14:22:14 +01:00
errors	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-28 22:45:17 -06:00
notification_mailer	Add direction tags to HTML e-mails for RTL languages (#6373)	2018-01-29 00:22:20 +01:00
oauth	…
remote_follow	…
settings	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-02-02 08:39:52 -06:00
shared	…
shares	…
stream_entries	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-09 14:16:45 -06:00
tags	…
user_mailer	Improve HTML e-mails based on Litmus tests (#6301)	2018-01-20 01:32:21 +01:00
well_known	…