diff options
| author | Jeroen <vo.jeroen@gmail.com> | 2018-07-14 20:24:46 +0200 |
|---|---|---|
| committer | Jeroen <vo.jeroen@gmail.com> | 2018-07-14 20:24:46 +0200 |
| commit | 505530f36abba53234c2fa29262a0de87face4fb (patch) | |
| tree | 313bbefb0f7b9693f1189a86410fe3dcdb9207f7 /synapse/handlers/__init__.py | |
| parent | Merge branch 'develop' into send_sni_for_federation_requests (diff) | |
| parent | Fix develop because I broke it :( (#3535) (diff) | |
| download | synapse-505530f36abba53234c2fa29262a0de87face4fb.tar.xz | |
Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests
# Conflicts: # synapse/crypto/context_factory.py
Diffstat (limited to 'synapse/handlers/__init__.py')
| -rw-r--r-- | synapse/handlers/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index d358842b3e..4b9923d8c0 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .register import RegistrationHandler -from .room import RoomContextHandler -from .message import MessageHandler -from .federation import FederationHandler -from .directory import DirectoryHandler from .admin import AdminHandler +from .directory import DirectoryHandler +from .federation import FederationHandler from .identity import IdentityHandler +from .message import MessageHandler +from .register import RegistrationHandler +from .room import RoomContextHandler from .search import SearchHandler |