David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss		2018-01-19 15:22:10 -06:00
..
about	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
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	New error page graphic. Other error page improvements (#5099)	2017-09-25 23:05:54 +02:00
follower_accounts
following_accounts
home	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
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-19 15:22:10 -06:00
notification_mailer	Change mailer image url (#6279)	2018-01-17 12:41:24 +01:00
oauth	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
remote_follow
settings	Don't show skins selector when there's only one (#256)	2018-01-08 16:45:32 -08:00
shared	fix presented og:url is incorrect (#5320)	2017-10-11 19:22:21 +02:00
shares	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
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	Replace tutorial modal with welcome e-mail (#6273)	2018-01-18 19:17:25 +01:00
well_known	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00