Jason Wen dbaba022a2 Fix upstream merge conflicts

2024-02-27 21:28:12 -05:00

..

assets

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

athena

move with_http_server to selfdrive/test/helpers (#31597)

2024-02-26 12:53:17 -08:00

boardd

use pyupgrade to update to new typing syntax (#31580)

2024-02-24 16:41:23 -08:00

car

Fix upstream merge conflicts

2024-02-27 21:28:12 -05:00

controls

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

debug

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

locationd

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

manager

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

modeld

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

monitoring

Merge branch 'upstream/openpilot/master' into sync-20240216

2024-02-16 08:27:39 -05:00

navd

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

sunnypilot

Driving Model Selector: Can't import Params on PC

2024-02-12 16:00:32 -05:00

test

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

thermald

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

ui

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

__init__.py

…

mapd_manager.py

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

sentry.py

Fix upstream merge conflicts

2024-02-27 21:28:12 -05:00

statsd.py

use pyupgrade to update to new typing syntax (#31580)

2024-02-24 16:41:23 -08:00

tombstoned.py

simplify git remote is comma check (#31284)

2024-02-02 21:23:32 -08:00

updated.py

Merge remote-tracking branch 'commaai/openpilot/master' into sync-20240224

2024-02-26 16:39:04 -05:00