Commit graph

4 commits

Author SHA1 Message Date
Kegan Dougal
f95d19cecd Merge branch 'master' into appservice-swagger
Conflicts:
	specification/application_service_api.rst
2015-10-21 09:55:53 +01:00
Kegan Dougal
f3088a0674 Merge branch 'master' into spec-182-asapi-user-creation 2015-10-19 13:39:21 +01:00
Daniel Wagner-Hall
22fdb8f911 Merge branch 'master' into daniel/as 2015-10-19 10:37:12 +01:00
Kegan Dougal
3d087df538 Kill number prefixes for good 2015-10-15 13:40:05 +01:00
Renamed from specification/3-application_service_api.rst (Browse further)