Paul "LeoNerd" Evans 1c51c8ab7d Merge remote-tracking branch 'origin/develop' into test-sqlite-memory ... Conflicts: synapse/storage/pdu.py		2014-09-12 17:20:06 +01:00
..
api	Added captcha support on both the HS and web client.	2014-09-05 23:32:51 -07:00
app	prepare_database() on db_conn, not plain name, so we can pass in the connection from outside	2014-09-10 16:23:58 +01:00
config	Add config opion for XFF headers when performing ReCaptcha auth.	2014-09-05 22:51:11 -07:00
crypto
federation	Make the state resolution use actual power levels rather than taking them from a Pdu key.	2014-09-12 17:11:09 +01:00
handlers	Added num_joined_users key to /publicRooms for each room. Show this information in the webclient.	2014-09-08 12:15:29 -07:00
http
rest	Added captcha support on both the HS and web client.	2014-09-05 23:32:51 -07:00
storage	Merge remote-tracking branch 'origin/develop' into test-sqlite-memory	2014-09-12 17:20:06 +01:00
streams
util
__init__.py	Bump version and changelog	2014-09-08 11:28:50 +02:00
notifier.py
server.py	Move database preparing code out of homserver.py into storage where it belongs	2014-09-10 15:42:15 +01:00
state.py	Make the state resolution use actual power levels rather than taking them from a Pdu key.	2014-09-12 17:11:09 +01:00
types.py