Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

73e4ad4b

Commit 73e4ad4b authored 9 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'master' into develop

Conflicts:
	setup.py

parents bdf2e586 227b7740

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 11 additions, 0 deletions

CHANGES.rst
README.rst 1 addition, 0 deletions

README.rst
scripts/synapse_port_db 9 additions, 6 deletions

scripts/synapse_port_db
setup.py 1 addition, 1 deletion

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

synapse/__init__.py
synapse/app/homeserver.py 1 addition, 1 deletion

synapse/app/homeserver.py
synapse/config/_base.py 1 addition, 1 deletion

synapse/config/_base.py

with 25 additions and 10 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