Martin Angers 6b9fecf172 Fix conflicts		2024-05-29 16:08:51 -04:00
..
desktop	Software SS: add menu item to Fleet Desktop (#19289)	2024-05-27 14:00:03 -04:00
fleetd_tables	Updated macadmins and added new tables. (#18819)	2024-05-08 08:57:16 -05:00
orbit	ignore osquery error when valid host info data is returned (#19233)	2024-05-23 12:31:39 -05:00