Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

db0dca2f

Commit db0dca2f authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents dfa98f91 89c0cd4a

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 47 additions, 4 deletions

CHANGES.rst
docs/CAPTCHA_SETUP 0 additions, 0 deletions

docs/CAPTCHA_SETUP
docs/application_services.rst 36 additions, 0 deletions

docs/application_services.rst
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/python_dependencies.py 3 additions, 3 deletions

synapse/python_dependencies.py

with 87 additions and 8 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