Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

b8d49be5

Commit b8d49be5 authored 9 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into markjh/twisted-15

Conflicts:
	synapse/python_dependencies.py

parents 90abdaf3 b579a8ea

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

contrib/systemd/log_config.yaml 2 additions, 0 deletions

contrib/systemd/log_config.yaml
synapse/app/homeserver.py 4 additions, 0 deletions

synapse/app/homeserver.py
synapse/config/captcha.py 4 additions, 0 deletions

synapse/config/captcha.py
synapse/config/server.py 1 addition, 0 deletions

synapse/config/server.py
synapse/events/__init__.py 10 additions, 1 deletion

synapse/events/__init__.py
synapse/handlers/auth.py 1 addition, 1 deletion

synapse/handlers/auth.py
synapse/http/server.py 12 additions, 4 deletions

synapse/http/server.py
synapse/python_dependencies.py 4 additions, 3 deletions

synapse/python_dependencies.py
synapse/rest/client/v1/__init__.py 1 addition, 1 deletion

synapse/rest/client/v1/__init__.py
synapse/rest/client/v2_alpha/__init__.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/__init__.py
synapse/storage/events.py 13 additions, 10 deletions

synapse/storage/events.py

with 53 additions and 21 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