Lucas Nogueira 93afa71d9a chore: fix merge conflicts from dev

2023-06-15 10:37:02 -03:00

..

tauri

chore: fix merge conflicts from dev

2023-06-15 10:37:02 -03:00

tauri-build

Merge remote-tracking branch 'origin/dev' into next (#7212)

2023-06-15 09:52:33 -03:00

tauri-codegen

Merge remote-tracking branch 'origin/dev' into next (#7212)

2023-06-15 09:52:33 -03:00

tauri-config-schema

chore: fix doc link (#7147)

2023-06-07 15:11:48 +03:00

tauri-macros

Merge remote-tracking branch 'origin/dev' into next (#7212)

2023-06-15 09:52:33 -03:00

tauri-runtime

chore: fix merge conflicts from dev

2023-06-15 10:37:02 -03:00

tauri-runtime-wry

Merge remote-tracking branch 'origin/dev' into next (#7212)

2023-06-15 09:52:33 -03:00

tauri-utils

Merge remote-tracking branch 'origin/dev' into next (#7212)

2023-06-15 09:52:33 -03:00

tests/restart

fix(tests): adjust default bundle target for updater integration test (#7201)

2023-06-14 11:17:02 -03:00