diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-18 14:52:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-18 14:52:19 +0100 |
| commit | 79a5fb469b58ea0561a917117cd471d6cd8761df (patch) | |
| tree | 2cdfba70dd998a6fae20af8cfee440f809ce357c /synapse | |
| parent | Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Bump changelog and versions (diff) | |
| download | synapse-79a5fb469b58ea0561a917117cd471d6cd8761df.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |