Commit Graph

4 Commits (30d46a19d51e8ed64ef9743ee7f6f451c034a723)

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