David Baker 0bba2799b6 Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override		2016-08-16 16:46:37 +01:00
..
api	Fix login with m.login.token	2016-08-08 16:40:39 +01:00
app	Remove broken cache stuff	2016-08-15 11:25:48 +01:00
appservice
config	Update password config comment	2016-07-06 12:18:19 +09:00
crypto	Don't print stack traces when failing to get remote keys	2016-08-10 10:44:37 +01:00
events	Include prev_content in redacted state events	2016-08-11 10:24:41 +01:00
federation	PEP8	2016-08-10 16:34:10 +01:00
handlers	Merge pull request #1012 from matrix-org/erikj/limit_backfill_uri	2016-08-16 12:55:42 +01:00
http	Clean up TransactionQueue	2016-08-10 16:24:16 +01:00
metrics	Make psutil optional	2016-08-08 11:12:21 +01:00
push	Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override	2016-08-16 16:46:37 +01:00
replication	Use cached get_user_by_access_token in slaves	2016-08-16 11:24:32 +01:00
rest	Flake8	2016-08-16 14:57:21 +01:00
static/client
storage	Merge pull request #1010 from matrix-org/erikj/refactor_deletions	2016-08-16 11:37:53 +01:00
streams
util	Clean up TransactionQueue	2016-08-10 16:24:16 +01:00
__init__.py	Bump changelog and version	2016-08-08 11:31:12 +01:00
notifier.py	Notify users for events in rooms they join.	2016-06-07 11:33:36 +01:00
python_dependencies.py	Make psutil optional	2016-08-08 11:12:21 +01:00
server.py	Make synchrotron accept /events	2016-08-12 15:31:44 +01:00
server.pyi	Fix login with m.login.token	2016-08-08 16:40:39 +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