You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/views
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/javascript/styles/mastodon/components.scss
8 years ago
..
about Finalized theme loading and stuff 8 years ago
accounts Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
admin Merge remote-tracking branch 'origin/master' into merge-upstream 8 years ago
admin_mailer
application
auth Handle sessions that can't be translated (#6245) 8 years ago
authorize_follows
errors
follower_accounts
following_accounts
home Finalized theme loading and stuff 8 years ago
invites Fix invites form path (#5861) 8 years ago
kaminari
layouts Merge remote-tracking branch 'origin/master' into merge-upstream 8 years ago
notification_mailer Improve HTML e-mails based on Litmus tests (#6301) 8 years ago
oauth
remote_follow
settings Don't show skins selector when there's only one (#256) 8 years ago
shared
shares Finalized theme loading and stuff 8 years ago
stream_entries Merge remote-tracking branch 'origin/master' into merge-upstream 8 years ago
tags Merge remote-tracking branch 'tootsuite/master' into merge-upstream 8 years ago
user_mailer Improve HTML e-mails based on Litmus tests (#6301) 8 years ago
well_known Remove rabl dependency (#5894) 8 years ago