Neil Johnson 2414178ed6 Merge branch 'master' into develop		2018-05-01 18:53:56 +01:00
..
api	Apply some limits to depth to counter abuse	2018-05-01 17:54:19 +01:00
app	Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background	2018-04-27 14:31:23 +01:00
appservice	…
config	Merge pull request #3085 from NotAFile/py3-config-text-mode	2018-04-30 01:00:23 +01:00
crypto	Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157)	2018-04-30 16:21:11 +01:00
events	add comment explaining attributeerror	2018-04-30 09:49:10 +02:00
federation	Merge branch 'release-v0.28.1' into develop	2018-05-01 18:16:57 +01:00
groups	…
handlers	Merge branch 'release-v0.28.1' into develop	2018-05-01 18:16:57 +01:00
http	Merge pull request #3154 from NotAFile/py3-stringio	2018-04-30 00:59:04 +01:00
metrics	…
module_api	…
push	Merge pull request #3152 from NotAFile/py3-local-imports	2018-04-30 01:28:13 +01:00
replication	…
rest	add guard for None on purge_history api	2018-04-30 14:29:48 +02:00
static/client	…
storage	Merge pull request #3129 from matrix-org/matthew/fix_group_dups	2018-04-30 11:47:25 +01:00
streams	…
util	Merge pull request #3144 from matrix-org/rav/run_in_background_exception_handling	2018-04-30 10:23:02 +01:00
__init__.py	Update __init__.py	2018-05-01 18:22:53 +01:00
event_auth.py	…
notifier.py	…
python_dependencies.py	Miscellaneous fixes to python_dependencies	2018-05-01 18:13:54 +01:00
server.py	…
server.pyi	…
state.py	…
types.py	…
visibility.py	…