Daniel Wagner-Hall f38df51e8d Merge branch 'develop' into daniel/3pidinvites		2015-10-15 11:51:55 +01:00
..
v1	Remove unnecessary class-wrapping	2015-10-13 18:00:38 +01:00
v2_alpha	Include invites in incremental sync	2015-10-13 11:43:12 +01:00
__init__.py	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00