Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

matrix-react-sdk
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

90aa4223

Commit 90aa4223 authored 9 years ago by Matthew Hodgson

Downloads
- Plain Diff

merge develop

parents b457a4e4 795435b1

Branches matthew/cancellable-upgrade

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

src/TextForEvent.js 27 additions, 1 deletion

src/TextForEvent.js
src/components/structures/MatrixChat.js 9 additions, 2 deletions

src/components/structures/MatrixChat.js
src/components/structures/RoomView.js 2 additions, 3 deletions

src/components/structures/RoomView.js
src/components/structures/ScrollPanel.js 1 addition, 1 deletion

src/components/structures/ScrollPanel.js
src/components/structures/UserSettings.js 10 additions, 1 deletion

src/components/structures/UserSettings.js
src/components/views/rooms/EventTile.js 2 additions, 1 deletion

src/components/views/rooms/EventTile.js
src/components/views/rooms/RoomSettings.js 1 addition, 1 deletion

src/components/views/rooms/RoomSettings.js

with 52 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment