diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-04 14:00:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-04 14:00:27 +0100 |
| commit | 822a0f0435994d52e2f5fe25f7fa6f8d62cdbb2f (patch) | |
| tree | c59a72ef7e7a6fddeb03f123d4559ac23c706f1c /synapse | |
| parent | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-822a0f0435994d52e2f5fe25f7fa6f8d62cdbb2f.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 index 5fe8631973..cf22fabd61 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.1.0rc2" +__version__ = "1.1.0" |