Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux

2017-01-24 20:47:24 +00:00 · 2017-01-24 20:47:24 +00:00 · 6dd46d532a
commit 6dd46d532a
parent b323551f22 55591f2019
124 changed files with 1837 additions and 654 deletions
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@ -42,7 +42,7 @@ module.exports = React.createClass({
            height: 40,
            resizeMethod: 'crop',
            defaultToInitialLetter: true
-        }
+        };
    },

    getInitialState: function() {