Merge remote-tracking branch 'origin/develop' into dbkr/user_search_feedback

2017-01-24 11:26:09 +00:00 · 2017-01-24 11:26:09 +00:00 · f1f6fc809c
commit f1f6fc809c
parent de621902fc c47d3e04a5
122 changed files with 1769 additions and 593 deletions
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@ -111,7 +111,7 @@ module.exports = React.createClass({
            info = (
                <div className={unknownMxClasses}>{ this.props.address }</div>
            );
-        } else if (email)  {
+        } else if (email) {
            var emailClasses = classNames({
                "mx_AddressTile_email": true,
                "mx_AddressTile_justified": this.props.justified,