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.

Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'		7 years ago
..
about	Merge upstream (#111)	7 years ago
accounts	Merge git://github.com/tootsuite/mastodon into tootsuite-master	7 years ago
admin	Allow domain blocks that only reject media without silencing or suspending (#4325)	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	Fix autocomplete option in haml files (#4438)	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	Multiple frontend support (#110)	7 years ago
kaminari	Pagination improvements (#1445)	8 years ago
layouts	Merge remote-tracking branch 'upstream/master'	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	Added haml-lint and fix warnings (#2773)	8 years ago
remote_follow	Fix remote follow (#2547)	8 years ago
settings	Merge upstream (#111)	7 years ago
shared	Fix locale regression from #3055 (#3231)	8 years ago
stream_entries	Merge upstream (#81)	7 years ago
tags	Adjust tags and accounts page (#4534)	7 years ago
user_mailer	i18n: update Persian translation (#4470)	7 years ago
well_known	Send short account URL to remote instance (regression from #3844) (#4355)	7 years ago