diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-12-10 16:21:00 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-12-10 16:21:00 +0000 |
| commit | d7ee7b589f0535c21301f38e93b0cabc0cf288d4 (patch) | |
| tree | fcd7d110dc66d5e175f1030d10e0bbd5624bbf3c /synapse/config/server.py | |
| parent | Don't complain if /make_join response lacks 'prev_state' list (SYN-517) (diff) | |
| parent | Merge pull request #432 from matrix-org/pushrules_refactor (diff) | |
| download | synapse-d7ee7b589f0535c21301f38e93b0cabc0cf288d4.tar.xz | |
Merge branch 'develop' into paul/tiny-fixes
Diffstat (limited to 'synapse/config/server.py')
| -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 |