Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

7dfd99f1

Commit 7dfd99f1 authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge pull request #31 from matrix-org/client_api_resource

Merge rest servlets into the client json resource object

parents 3a243c53 7256def8

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/homeserver.py 2 additions, 3 deletions

synapse/app/homeserver.py
synapse/rest/client/v1/__init__.py 7 additions, 11 deletions

synapse/rest/client/v1/__init__.py
synapse/server.py 0 additions, 10 deletions

synapse/server.py
tests/rest/client/v1/test_presence.py 6 additions, 3 deletions

tests/rest/client/v1/test_presence.py
tests/rest/client/v1/test_profile.py 3 additions, 1 deletion

tests/rest/client/v1/test_profile.py

with 18 additions and 28 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