You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Robertson 580be61df7 Conflicted state set is a set of events (#1120) ... In #1042 I incorrectly wrote that the conflicted state set is a set of pairs (K, V). We later take the union of the conflicted state set and the auth difference. The latter is a set of events (V) only. Fix this by making the conflicted state set a set of events rather than a set of pairs. That is, the conflicted state set is a a `Set[Event]` instead of a `Set[((type, state key), event)]`.		4 years ago
..
client-server-api	Deprecate the `sender_key` and `device_id` on Megolm events (#1101)	4 years ago
rooms	Conflicted state set is a set of events (#1120)	4 years ago
_index.md	Fix broken links to `matrix-doc` (#1032)	4 years ago
appendices.md	Fix broken links to `matrix-doc` (#1032)	4 years ago
application-service-api.md	Re-add timestamp massaging (#1094)	4 years ago
changelog.md	v1.2 changelog	4 years ago
identity-service-api.md	Fix broken links to `matrix-doc` (#1032)	4 years ago
proposals.md	Get rid of the `proprosal-in-review` label (#1036)	4 years ago
push-gateway-api.md	Update content to call the new template for HTTP APIs	4 years ago
server-server-api.md	Specify room version 10: `knock_restricted` and int power levels (#1099)	4 years ago