diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-03 18:25:17 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-03 18:25:17 +0100 |
| commit | d72ce4da64416eb10224e6a6b55aecdd27967b6b (patch) | |
| tree | ec86c93b1ebaf0ebb11f9e9d2a5377f608ab98b2 /tests/federation/test_federation.py | |
| parent | Make registering and logging in with a threepid work in the webclient. (diff) | |
| parent | Fix ban path (diff) | |
| download | synapse-d72ce4da64416eb10224e6a6b55aecdd27967b6b.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts: synapse/http/client.py
Diffstat (limited to 'tests/federation/test_federation.py')
| -rw-r--r-- | tests/federation/test_federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index 51308ca358..0b105fe723 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -1,4 +1,4 @@ -# Copyright 2014 matrix.org +# Copyright 2014 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |