Erik Johnston 464e1fcfa5 Merge branch 'master' of github.com:matrix-org/synapse into release-v0.2.0 ... Conflicts: synapse/notifier.py webclient/room/room-controller.js webclient/room/room.html		2014-09-02 15:26:11 +01:00
..
api	Fix bug where we didn't correctly store the ops power levels event.	2014-09-02 12:12:14 +01:00
app	Add unsecure listener port to homeserver	2014-09-01 22:38:52 +01:00
config	Remove option for disabling webclient because it was confusing	2014-09-02 11:09:41 +01:00
crypto	enable ECDHE ciphers	2014-09-01 22:29:44 +01:00
federation	Add all the necessary checks to make banning work.	2014-09-01 18:24:56 +01:00
handlers	Safer handling of incoming presence EDUs that may or maynot contain 'presence' or 'state'	2014-09-02 11:17:43 +01:00
http	given everything's apparently gone https:// by default for c-s, change this hardcoding...	2014-09-01 23:28:43 +01:00
rest	Order matters when adding REST servlets	2014-09-02 12:53:36 +01:00
storage	Fix bug where we didn't correctly store the ops power levels event.	2014-09-02 12:12:14 +01:00
streams	…
util	…
__init__.py	…
notifier.py	Merge branch 'master' of github.com:matrix-org/synapse into release-v0.2.0	2014-09-02 15:26:11 +01:00
server.py	…
state.py	…
types.py	…