Merge branch 'develop' into luke/feature-async-pills
This commit is contained in:
commit
d13c4b510c
5 changed files with 113 additions and 4 deletions
|
@ -170,11 +170,11 @@ const Pill = React.createClass({
|
|||
|
||||
if (this.state.pillType) {
|
||||
return this.props.inMessage ?
|
||||
<a className={classes} href={this.props.url}>
|
||||
<a className={classes} href={this.props.url} title={resource}>
|
||||
{avatar}
|
||||
{linkText}
|
||||
</a> :
|
||||
<span className={classes}>
|
||||
<span className={classes} title={resource}>
|
||||
{avatar}
|
||||
{linkText}
|
||||
</span>;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue