Mark Haines 6e856d7729 Merge master into develop ... Conflicts: README.rst setup.py		2015-02-02 14:05:42 +00:00
..
api	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 15:16:38 +00:00
app	Merge branch 'develop' into pushers	2015-01-28 12:51:05 +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	Resign events when we return them via /query_auth/	2015-01-30 22:53:13 +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	Spit out server default rules too.	2015-01-30 15:54:51 +00:00
storage	Merge pull request #43 from matrix-org/rejections	2015-01-30 16:11:14 +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 master into develop	2015-02-02 14:05:42 +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 changes from develop	2015-01-29 14:55:27 +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