Brendan Abolivier 789606577a Merge branch 'master' into develop		2020-06-16 10:36:29 +01:00
..
v1	Update m.id.phone to use 'phone' instead of 'number' (#7687)	2020-06-15 17:46:23 +01:00
v2_alpha	Enable 3PID add/bind/unbind endpoints on r0 routes	2020-06-15 16:14:13 +01: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	Support CS API v0.6.0 (#6585)	2020-06-05 12:27:37 +01:00