Merge pull request #4862 from matrix-org/erikj/dinsic-merged-master dinsic_2019-03-15

Merge master into dinsic

1 files changed, 4 insertions, 4 deletions

diff --git a/synapse/config/user_directory.py b/synapse/config/user_directory.py

index eba99976ac..3b3d0f8e41 100644
--- a/synapse/config/user_directory.py
+++ b/synapse/config/user_directory.py
@@ -46,8 +46,8 @@ class UserDirectoryConfig(Config):
         #user_directory:
         #   search_all_users: false
         #
-        #   If this is set, user search will be delegated to this ID server instead
-        #   of synapse performing the search itself.
-        #   This is an experimental API.
-        #   defer_to_id_server: https://id.example.com
+        #  # If this is set, user search will be delegated to this ID server instead
+        #  # of synapse performing the search itself.
+        #  # This is an experimental API.
+        #  defer_to_id_server: https://id.example.com
         """