Thomas Heartman e7ae1ff714 Feat(#4209): add conflict marker to segment changes (#4447) ... In doing so, we extract the shared conflict marker component from the feature change and reuse it for both feature and segment changes. Here's what it looks like:  Update: also straightened out the borders of the conflict warning: 		2023-08-08 12:36:45 +00:00
..
addons	fix: Addons toggle (#4312)	2023-07-24 16:23:41 +02:00
admin	feat: add prom metric for total custom root roles in use (#4438)	2023-08-08 08:14:40 +01:00
application
archive	fix: stable bulk updates (#4352)	2023-07-28 08:44:29 +02:00
changeRequest	Feat(#4209): add conflict marker to segment changes (#4447)	2023-08-08 12:36:45 +00:00
common	Feat: last seen by env UI (#4439)	2023-08-08 12:32:33 +03:00
context	chore: remove split button strategy flag (#4245)	2023-07-14 14:23:23 +03:00
demo	fix: ensure userId context exists when running demo (#4144)	2023-07-05 10:49:18 +01:00
environments
events	feat: upgrade AdminAlert to PermissionGuard (#4074)	2023-06-23 13:25:35 +01:00
feature	feat: strategy variants events (#4430)	2023-08-07 11:45:36 +02:00
featureTypes	1-1192: track the feature type and the new lifetime (#4395)	2023-08-03 11:34:03 +02:00
feedback
layout	Fix: change request info (#3971)	2023-07-04 09:09:05 +02:00
loginHistory	Menu update - improvements and mobile version (#4423)	2023-08-07 18:13:56 +02:00
maintenance
menu	Menu update - improvements and mobile version (#4423)	2023-08-07 18:13:56 +02:00
playground/Playground	fix: dot in context fields (#4434)	2023-08-07 13:53:22 +02:00
project	feat: default strategy variant (#4443)	2023-08-08 11:44:43 +02:00
providers	fix: correct escaping of ui flags for plausible (#3907)	2023-07-07 17:40:37 +02:00
segments	feat(#4209): add segment to drafts (#4408)	2023-08-04 12:57:26 +00:00
splash
strategies
tags	feat: responsive strategy icons (#4121)	2023-06-29 18:01:27 +01:00
user	refactor: roles - make better plan assumptions (#4113)	2023-06-28 16:00:14 +01:00
App.tsx
InitialRedirect.tsx