Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

2ffb0757

Commit 2ffb0757 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'master' of github.com:matrix-org/synapse into develop

parents d4fb1c8a ecce3016

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

docs/client-server/howto.rst 5 additions, 1 deletion

docs/client-server/howto.rst
jsfiddles/create_room_send_msg/demo.css 17 additions, 0 deletions

jsfiddles/create_room_send_msg/demo.css
jsfiddles/create_room_send_msg/demo.html 30 additions, 0 deletions

jsfiddles/create_room_send_msg/demo.html
jsfiddles/create_room_send_msg/demo.js 109 additions, 0 deletions

jsfiddles/create_room_send_msg/demo.js
webclient/app-directive.js 38 additions, 0 deletions

webclient/app-directive.js
webclient/app-filter.js 79 additions, 0 deletions

webclient/app-filter.js
webclient/app.js 0 additions, 81 deletions

webclient/app.js
webclient/index.html 3 additions, 0 deletions

webclient/index.html
webclient/room/room-controller.js 0 additions, 89 deletions

webclient/room/room-controller.js
webclient/room/room-directive.js 134 additions, 0 deletions

webclient/room/room-directive.js

with 415 additions and 171 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