diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-24 20:13:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 20:13:30 +0100 |
| commit | 60577f4c6ee9f4a4c9af0a41a8954e19a5f2c8cf (patch) | |
| tree | 8c661ea7ceaff780965631c530ca065805c1861d /app/assets/javascripts/components/features/account/index.jsx | |
| parent | 5e33445c5ff9ded56c2d40eb17d89ace108c3840 (diff) | |
| parent | 8e34bed7cce7b97388e55fabacee7d424b5846ea (diff) | |
Merge branch 'master' into french-translation
Diffstat (limited to 'app/assets/javascripts/components/features/account/index.jsx')
| -rw-r--r-- | app/assets/javascripts/components/features/account/index.jsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/features/account/index.jsx b/app/assets/javascripts/components/features/account/index.jsx index 818979f8f..c2cc58bb2 100644 --- a/app/assets/javascripts/components/features/account/index.jsx +++ b/app/assets/javascripts/components/features/account/index.jsx @@ -87,9 +87,8 @@ const Account = React.createClass({ return ( <Column> <ColumnBackButton /> - <Header account={account} me={me} /> - - <ActionBar account={account} me={me} onFollow={this.handleFollow} onBlock={this.handleBlock} onMention={this.handleMention} /> + <Header account={account} me={me} onFollow={this.handleFollow} /> + <ActionBar account={account} me={me} onBlock={this.handleBlock} onMention={this.handleMention} /> {this.props.children} </Column> |