Brendan Abolivier 9dc84b7989 Merge branch 'develop' into babolivier/context_filters		2019-12-04 14:23:44 +00:00
..
v1	MSC2367 Allow reason field on all member events	2019-11-28 11:02:04 +00:00
v2_alpha	Add User-Interactive Auth to /account/3pid/add (#6119)	2019-11-29 13:51:14 +00:00
__init__.py	copyrights	2016-01-07 04:26:29 +00:00
transactions.py	Move logging utilities out of the side drawer of util/ and into logging/ (#5606)	2019-07-04 00:07:04 +10:00
versions.py	Update copyrights	2019-11-05 14:46:35 +00:00