archive
/
matrix-spec
mirror of https://github.com/matrix-org/matrix-spec
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rav/SPEC-254' into rav/flatten_sync

Browse Source 
Conflicts:
	api/client-server/v2_alpha/definitions/event.json
	api/client-server/v2_alpha/sync.yaml
pull/977/head
Richard van der Hoff 9 years ago
parent e1b12a753e 8316881393
commit 58b7901b51
Show Stats Download Patch File Download Diff File

Diff Content Not Available