Merge branch 'develop' into matthew/redesign
This commit is contained in:
commit
ffb9ce89c7
15 changed files with 100 additions and 23 deletions
|
@ -17,7 +17,6 @@ limitations under the License.
|
|||
'use strict';
|
||||
|
||||
var React = require('react');
|
||||
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
|
||||
|
||||
var RoomAvatarController = require('matrix-react-sdk/lib/controllers/atoms/RoomAvatar')
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue