summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-11-18 12:05:36 +0000
committerRichard van der Hoff <richard@matrix.org>2019-11-18 12:05:36 +0000
commit870c00e278a8156cf67f8c916c39215ef2333b56 (patch)
tree6a3fb77c7d8b1c2f9d919e1aa3b91de8a61567ab /synapse/__init__.py
parentnewsfile (diff)
parentReplace UPDATE with UPSERT on device_max_stream_id table (#6363) (diff)
downloadsynapse-870c00e278a8156cf67f8c916c39215ef2333b56.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/event_auth/4
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index ec16f54a49..1c27d68009 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-""" This is a reference implementation of a Matrix home server.
+""" This is a reference implementation of a Matrix homeserver.
 """
 
 import os