Merge pull request #1647 from LLK/release/2.2.26

[Develop] Release 2.2.26
This commit is contained in:
Matthew Taylor 2017-11-03 12:04:11 -04:00 committed by GitHub
commit 7e00d40325
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -157,7 +157,7 @@ var Credits = React.createClass({
</li> </li>
<li> <li>
<img src="//cdn2.scratch.mit.edu/get_image/user/default_60x60.png" alt="Joel Avatar" /> <img src="//cdn2.scratch.mit.edu/get_image/user/26249744_60x60.png" alt="Joel Avatar" />
<span className="name">Joel Gritter</span> <span className="name">Joel Gritter</span>
</li> </li>

View file

@ -131,7 +131,7 @@ var Messages = React.createClass({
messages={this.props.messages} messages={this.props.messages}
adminMessages={this.props.adminMessages} adminMessages={this.props.adminMessages}
scratcherInvite={this.props.invite} scratcherInvite={this.props.invite}
numNewMessages={this.props.numNewSocialMessages} numNewMessages={this.props.numNewMessages}
handleFilterClick={this.handleFilterClick} handleFilterClick={this.handleFilterClick}
handleAdminDismiss={this.handleMessageDismiss} handleAdminDismiss={this.handleMessageDismiss}
loadMore={loadMore} loadMore={loadMore}