diff options
author | Erik Johnston <erik@matrix.org> | 2016-02-10 17:06:53 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-02-10 17:06:53 +0000 |
commit | 7718303e71d6e8acc59df300d31d31c0cc058868 (patch) | |
tree | a5d06450202f759b4a04aa702e710ed620c5dd9c /synapse | |
parent | Update CHANGES (diff) | |
parent | 0.13.1 (diff) | |
download | synapse-7718303e71d6e8acc59df300d31d31c0cc058868.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 | ||||
-rw-r--r-- | synapse/python_dependencies.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |