David Yip 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb		2018-01-21 13:36:10 -06:00
..
about	…
accounts	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
admin	Merge remote-tracking branch 'origin/master' into merge-upstream	2017-12-30 17:20:07 -06:00
admin_mailer	…
application	…
auth	Handle sessions that can't be translated (#6245)	2018-01-12 02:44:28 +01:00
authorize_follows	…
errors	…
follower_accounts	…
following_accounts	…
home	…
invites	Fix invites form path (#5861)	2017-12-01 12:26:57 +01:00
kaminari	…
layouts	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-20 10:45:43 -06:00
notification_mailer	Fix invalid value passed to full_asset_url in mailers (#6312)	2018-01-21 13:20:00 +01:00
oauth	…
remote_follow	…
settings	Don't show skins selector when there's only one (#256)	2018-01-08 16:45:32 -08:00
shared	…
shares	…
stream_entries	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-09 14:16:45 -06:00
tags	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
user_mailer	Improve HTML e-mails based on Litmus tests (#6301)	2018-01-20 01:32:21 +01:00
well_known	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00