summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-14 14:42:03 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-14 14:42:03 +0000
commitb02465b9db25e13c25479787cb581ac3c83e20b3 (patch)
treed69714d864b5a87021f2fc0d2216321a8ec7f562 /synapse
parentMerge pull request #4450 from 14mRh4X0r/fix-dependency-message (diff)
parentMerge tag 'v0.99.1' (diff)
downloadsynapse-b02465b9db25e13c25479787cb581ac3c83e20b3.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index c211cb4e6f..f7bac0ea4e 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2014-2016 OpenMarket Ltd
-# Copyright 2018 New Vector Ltd
+# Copyright 2018-9 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.1rc1"
+__version__ = "0.99.1"