Mastodon

Files

T

David Yip f4b2478af1 Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml

2018-01-28 22:45:17 -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 'tootsuite/master' into glitchsoc/master

2018-01-24 19:17:11 +00:00

admin_mailer

…

application

…

auth

Handle sessions that can't be translated (#6245 )

2018-01-12 02:44:28 +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

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-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

Don't show skins selector when there's only one (#256 )

2018-01-08 16:45:32 -08:00

shared

…

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