Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'		2017-08-07 22:43:52 +02:00
..
about	Merge upstream (#111)	2017-08-01 13:20:29 -07:00
accounts	Merge git://github.com/tootsuite/mastodon into tootsuite-master	2017-07-25 21:36:22 +02:00
admin	Allow domain blocks that only reject media without silencing or suspending (#4325)	2017-07-24 14:26:55 +02:00
admin_mailer	Make salutation of email localizable (#4454)	2017-07-31 00:18:44 +02:00
application	…
auth	Fix autocomplete option in haml files (#4438)	2017-07-29 14:20:31 +02:00
authorize_follows	Add "signed in as" header to some pages (#4523)	2017-08-05 04:24:58 +02:00
errors	…
follower_accounts	Add option to opt out of search engines on public profile/status pages (#4199)	2017-07-14 16:41:02 +02:00
following_accounts	Add option to opt out of search engines on public profile/status pages (#4199)	2017-07-14 16:41:02 +02:00
home	Multiple frontend support (#110)	2017-07-30 19:28:21 +02:00
kaminari	…
layouts	Merge remote-tracking branch 'upstream/master'	2017-08-07 22:43:52 +02:00
manifests	Fix manifest description (regression from #4122) (#4324)	2017-07-23 23:04:44 +02:00
notification_mailer	Make salutation of email localizable (#4454)	2017-07-31 00:18:44 +02:00
oauth	…
remote_follow	…
settings	Merge upstream (#111)	2017-08-01 13:20:29 -07:00
shared	…
stream_entries	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
tags	Adjust tags and accounts page (#4534)	2017-08-07 20:33:06 +02:00
user_mailer	i18n: update Persian translation (#4470)	2017-07-31 19:40:57 +02:00
well_known	Send short account URL to remote instance (regression from #3844) (#4355)	2017-07-25 15:59:43 +02:00