Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
This commit is contained in:
Thibaut Girka
2019-03-28 13:01:33 +01:00
141 changed files with 887 additions and 1808 deletions

View File

@@ -212,7 +212,7 @@ class Header extends ImmutablePureComponent {
<div className='account__header__bar'>
<div className='account__header__tabs'>
<a className='avatar' href={account.get('url')} target='_blank'>
<a className='avatar' href={account.get('url')} rel='noopener' target='_blank'>
<Avatar account={account} size={90} />
</a>