diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-03 21:08:35 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 21:08:35 +1000 |
| commit | 4fc4b881c58fd638db5f4dac0863721111b67af0 (patch) | |
| tree | cc1604f5e3b4e0a263e0e11a55b62ef4006a64a1 /synapse/config/server_notices_config.py | |
| parent | The project `matrix-synapse-auto-deploy` does not seem to be maintained anymore. (diff) | |
| parent | Merge pull request #3777 from matrix-org/neilj/fix_register_user_registration (diff) | |
| download | synapse-4fc4b881c58fd638db5f4dac0863721111b67af0.tar.xz | |
Merge branch 'develop' into develop
Diffstat (limited to 'synapse/config/server_notices_config.py')
| -rw-r--r-- | synapse/config/server_notices_config.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/server_notices_config.py b/synapse/config/server_notices_config.py index be1d1f762c..3c39850ac6 100644 --- a/synapse/config/server_notices_config.py +++ b/synapse/config/server_notices_config.py @@ -12,9 +12,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from ._base import Config from synapse.types import UserID +from ._base import Config + DEFAULT_CONFIG = """\ # Server Notices room configuration # |