diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-06-14 16:36:01 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-06-14 16:36:01 +0100 |
commit | 9a793f861c252e09ec5e15986a2ad01d3586d8ce (patch) | |
tree | fa57f00eea83a3ac2e2d48d1f0b6aaf5994e1839 /synapse/__init__.py | |
parent | add a last seen metric (#3396) (diff) | |
parent | Merge tag 'v0.31.2' (diff) | |
download | synapse-9a793f861c252e09ec5e15986a2ad01d3586d8ce.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r-- | synapse/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 78fc63aa49..faa183a99e 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd +# Copyright 2018 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. @@ -16,4 +17,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.31.1" +__version__ = "0.31.2" |