Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

4ae0844e

Commit 4ae0844e authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents e9abbe89 06a5a40e

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 14 additions, 5 deletions

CHANGES.rst
UPGRADE.rst 13 additions, 0 deletions

UPGRADE.rst
VERSION 1 addition, 1 deletion

VERSION
setup.py 3 additions, 2 deletions

setup.py
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/config/server.py 1 addition, 1 deletion

synapse/config/server.py
synapse/handlers/register.py 2 additions, 1 deletion

synapse/handlers/register.py
synapse/http/client.py 39 additions, 1 deletion

synapse/http/client.py

with 74 additions and 12 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