Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

2b1297c5

Commit 2b1297c5 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1

parents 4c228df1 bb4490c2

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

webclient/app.css 24 additions, 1 deletion

webclient/app.css
webclient/components/fileUpload/file-upload-service.js 136 additions, 5 deletions

webclient/components/fileUpload/file-upload-service.js
webclient/components/matrix/matrix-service.js 22 additions, 4 deletions

webclient/components/matrix/matrix-service.js
webclient/components/utilities/utilities-service.js 87 additions, 2 deletions

webclient/components/utilities/utilities-service.js
webclient/room/room-controller.js 12 additions, 22 deletions

webclient/room/room-controller.js
webclient/room/room.html 13 additions, 4 deletions

webclient/room/room.html

with 294 additions and 38 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