David Baker d72ce4da64 Merge branch 'develop' of github.com:matrix-org/synapse into develop ...

Conflicts:
	synapse/http/client.py

2014-09-03 18:25:17 +01:00

..

__init__.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

_base.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

directory.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

events.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

federation.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

login.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

message.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

presence.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

profile.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

register.py

Merge branch 'develop' of github.com:matrix-org/synapse into develop

2014-09-03 18:25:17 +01:00

room.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

typing.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00