You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ... Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss		7 years ago
..
about	Merge branch 'origin/master' into sync/upstream	7 years ago
accounts	Merge branch 'origin/master' into sync/upstream	7 years ago
admin	Scrollable tables in settings pages (#4857)	7 years ago
admin_mailer	Make salutation of email localizable (#4454)	7 years ago
application	Added haml-lint and fix warnings (#2773)	8 years ago
auth	Scrollable tables in settings pages (#4857)	7 years ago
authorize_follows	Add "signed in as" header to some pages (#4523)	7 years ago
errors	Added haml-lint and fix warnings (#2773)	8 years ago
follower_accounts	Add option to opt out of search engines on public profile/status pages (#4199)	7 years ago
following_accounts	Add option to opt out of search engines on public profile/status pages (#4199)	7 years ago
home	Merge branch 'origin/master' into sync/upstream	7 years ago
kaminari	Pagination improvements (#1445)	8 years ago
layouts	Merge tag 'v1.6.0rc3' into sync/upstream	7 years ago
manifests	Fix manifest description (regression from #4122) (#4324)	7 years ago
notification_mailer	Make salutation of email localizable (#4454)	7 years ago
oauth	Scrollable tables in settings pages (#4857)	7 years ago
remote_follow	Fix remote follow (#2547)	8 years ago
settings	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	7 years ago
shared	Redesign public profiles (#4608)	7 years ago
shares	Add protocol handler. Handle follow intents (#4511)	7 years ago
stream_entries	Merge tag 'v1.6.0rc3' into sync/upstream	7 years ago
tags	Adjust tags and accounts page (#4534)	7 years ago
user_mailer	i10n OC / FR update Pinned toots (#4842)	7 years ago
well_known	Send short account URL to remote instance (regression from #3844) (#4355)	7 years ago