Commit Graph

4 Commits (98dbf4d60b7e79d7b29fb0aa17e7aaa9bf7d0273)

Author SHA1 Message Date
Kegan Dougal f95d19cecd Merge branch 'master' into appservice-swagger
Conflicts:
	specification/application_service_api.rst
9 years ago
Kegan Dougal f3088a0674 Merge branch 'master' into spec-182-asapi-user-creation 9 years ago
Daniel Wagner-Hall 22fdb8f911 Merge branch 'master' into daniel/as 9 years ago
Kegan Dougal 3d087df538 Kill number prefixes for good 9 years ago