Kegan Dougal c059c9fea5 Merge branch 'develop' into application-services ...

Conflicts:
	synapse/handlers/__init__.py
	synapse/storage/__init__.py

2015-02-02 15:57:59 +00:00

..

api

Merge branch 'develop' into application-services

2015-02-02 15:57:59 +00:00

app

Merge branch 'develop' into application-services

2015-02-02 15:57:59 +00:00

config

Allow ':memory:' as the database path for sqlite3

2015-01-19 15:26:19 +00:00

crypto

Fix bug in timeout handling in keyclient

2015-01-30 11:08:01 +00:00

events

Merge pull request #43 from matrix-org/rejections

2015-01-30 16:11:14 +00:00

federation

Briefly doc structure of query_auth API.

2015-01-30 15:58:28 +00:00

handlers

Merge branch 'develop' into application-services

2015-02-02 15:57:59 +00:00

http

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

2015-01-30 11:10:37 +00:00

push

Ignore empty strings for display names & room names in notifications

2015-01-31 12:48:06 +00:00

rest

Merge branch 'develop' into application-services

2015-02-02 15:57:59 +00:00

storage

Merge branch 'develop' into application-services

2015-02-02 15:57:59 +00:00

streams

Update copyright notices

2015-01-06 13:21:39 +00:00

util

Optimize FrozenEvent creation

2015-01-06 18:51:03 +00:00

__init__.py

Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop

2015-01-13 10:01:22 +00:00

notifier.py

Fix Formatting

2015-01-27 20:19:36 +00:00

python_dependencies.py

Fix bad merge fo python_dependencies.py

2015-01-30 11:14:33 +00:00

server.py

Merge branch 'develop' into application-services

2015-02-02 15:57:59 +00:00

state.py

Remove debug logging

2015-01-30 15:56:32 +00:00

types.py

Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier

2015-01-28 17:16:12 +00:00