diff options
author | Neil Johnson <neil@fragile.org.uk> | 2018-04-24 15:52:43 +0100 |
---|---|---|
committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-24 15:52:43 +0100 |
commit | 1bb83d5d41e5e3e90ec14a6a9d1f385c452885de (patch) | |
tree | b409baa4722f9cccae3063e9e59361b5e018024a /synapse | |
parent | Revert "Bump version and update changelog" (diff) | |
parent | Bump version and update changelog (diff) | |
download | synapse-1bb83d5d41e5e3e90ec14a6a9d1f385c452885de.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to '')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |