diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-01-30 17:02:32 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-01-30 17:02:32 +0000 |
| commit | 6fba9fd20c8f29f6034236f653893a3bda165be2 (patch) | |
| tree | 1ce9b816637de72b36c8acfe03ac791d842b0905 /synapse | |
| parent | by default include m.room.encryption on invites (#3902) (diff) | |
| parent | v0.99.0rc2 (diff) | |
| download | synapse-6fba9fd20c8f29f6034236f653893a3bda165be2.tar.xz | |
Merge remote-tracking branch 'origin/release-v0.99.0' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/api/constants.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index d6a191ccc6..5da59aa924 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "0.34.1.1" +__version__ = "0.99.0rc2" diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 39ff4f62eb..f47c33a074 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -110,7 +110,7 @@ class RoomVersions(object): class RoomDisposition(object): - STABLE = "stable", + STABLE = "stable" UNSTABLE = "unstable" |