Mark Haines 29b25d59c6 Merge branch 'develop' into markjh/verify ... Conflicts: synapse/crypto/keyring.py		2016-07-27 15:11:02 +01:00
..
api	Merge pull request #952 from matrix-org/markjh/more_fixes	2016-07-26 19:20:56 +01:00
app	Fix flake8 violation	2016-07-26 11:59:08 +01:00
appservice	Move the AS handler out of the Handlers object.	2016-05-31 13:53:48 +01:00
config	Update password config comment	2016-07-06 12:18:19 +09:00
crypto	Merge branch 'develop' into markjh/verify	2016-07-27 15:11:02 +01:00
events
federation	Linearize some federation endpoints based on (origin, room_id)	2016-06-17 16:43:45 +01:00
handlers	Add create_requester function	2016-07-26 16:46:53 +01:00
http	Log when adding listeners	2016-07-25 17:22:15 +01:00
metrics	Don't explode if we have no snapshots yet	2016-07-20 16:59:52 +01:00
push	even more pep8	2016-06-24 11:47:11 +01:00
replication	pep8	2016-06-24 11:44:57 +01:00
rest	Add create_requester function	2016-07-26 16:46:53 +01:00
static/client
storage	Fix a couple of bugs in the transaction and keyring code	2016-07-26 19:19:08 +01:00
streams
util	typo	2016-07-26 10:09:25 +02:00
__init__.py	Bump version and changelog	2016-07-07 16:33:00 +01:00
notifier.py	Notify users for events in rooms they join.	2016-06-07 11:33:36 +01:00
python_dependencies.py	Add metrics for psutil derived memory usage	2016-07-20 16:00:21 +01:00
server.py	Add device_id support to /login	2016-07-18 16:39:44 +01:00
server.pyi	Type annotations	2016-07-19 18:56:16 +01:00
state.py	Comment	2016-07-15 09:29:54 +01:00
types.py	Add create_requester function	2016-07-26 16:46:53 +01:00
visibility.py