Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse

This commit is contained in:
Erik Johnston 2017-10-23 13:13:53 +01:00
commit ffba978077
83 changed files with 6543 additions and 576 deletions

View file

@ -50,7 +50,7 @@ master_doc = 'index'
# General information about the project.
project = u'Synapse'
copyright = u'2014, TNG'
copyright = u'Copyright 2014-2017 OpenMarket Ltd, 2017 Vector Creations Ltd, 2017 New Vector Ltd'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the