Hannah Hunter 6961be771f fix merge conflicts ... Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>		2024-06-17 14:59:08 -04:00
..
_index.md	Versioning and Support docs (#1225)	2021-02-16 14:28:30 -08:00
alpha-beta-apis.md	update to just scheduler; add to preview features	2024-05-29 10:53:30 -04:00
breaking-changes-and-deprecations.md	[WIP] - CustomResourceDefinition(CRD) term changed (#3696)	2023-09-12 12:53:39 -07:00
support-preview-features.md	Merge branch 'v1.14' into issue_3915	2024-06-04 12:24:10 -04:00
support-release-policy.md	successful upmerge	2024-06-14 11:25:41 -04:00
support-security-issues.md	Fix typos in multiple files in dapr-docs (#3839)	2023-10-20 08:20:37 -07:00
support-versioning.md	Updates to support and versioning (#3513)	2023-06-07 20:50:41 -07:00