diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
| commit | c2b4621630d982a38585c177d7c960c5127620bf (patch) | |
| tree | 8fdd440785ed56531c36e0f34e65fe139e6ce541 /synapse/config/server.py | |
| parent | Incorporate review (diff) | |
| parent | Remove "user_id" from GET /presence. (#7606) (diff) | |
| download | synapse-c2b4621630d982a38585c177d7c960c5127620bf.tar.xz | |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index f57eefc99c..73226e63d5 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -856,7 +856,7 @@ class ServerConfig(Config): # number of monthly active users. # # 'limit_usage_by_mau' disables/enables monthly active user blocking. When - # anabled and a limit is reached the server returns a 'ResourceLimitError' + # enabled and a limit is reached the server returns a 'ResourceLimitError' # with error type Codes.RESOURCE_LIMIT_EXCEEDED # # 'max_mau_value' is the hard limit of monthly active users above which |