diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-12-02 10:40:22 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-12-02 10:40:22 +0000 |
| commit | 2a0ec3b89d6b97e8a91ef5320d5e6675acacffdd (patch) | |
| tree | bc022d01b40c2fdc701d4e1183931217cb6dfd6f /synapse/config | |
| parent | Only fire user_joined_room if the membership has changed (diff) | |
| parent | Merge pull request #409 from MadsRC/develop (diff) | |
| download | synapse-2a0ec3b89d6b97e8a91ef5320d5e6675acacffdd.tar.xz | |
Merge branch 'develop' into markjh/edu_frequency
Conflicts: synapse/handlers/federation.py synapse/handlers/room.py
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 5c2d6bfeab..187edd516b 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -133,6 +133,7 @@ class ServerConfig(Config): # The domain name of the server, with optional explicit port. # This is used by remote servers to connect to this server, # e.g. matrix.org, localhost:8080, etc. + # This is also the last part of your UserID. server_name: "%(server_name)s" # When running as a daemon, the file to store the pid in |