Lucas Nogueira 93afa71d9a chore: fix merge conflicts from dev

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

..

locales

feat(bundler): wix localization, closes #3174 (#3179)

2022-02-05 15:13:07 -03:00

src

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

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

tauri-plugin-sample

refactor(android): fix race conditions processing Android plugin project as dependency (#6968)

2023-05-16 10:22:46 -03:00

.gitignore

chore(examples): readd gitignore rules for mobile api example

2022-08-14 20:54:14 -03:00

.taurignore

chore(examples): ignore changes on tauri-plugin-sample on dev watcher

2023-02-24 10:22:43 -03:00

build.rs

Merge branch 'dev' into next

2023-02-19 11:34:02 -03:00

Cargo.lock

chore: fix merge conflicts from dev

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

Cargo.toml

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

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

Cross.toml

feat: add docker images for cross (#4702)

2022-07-27 14:58:43 -03:00

Info.plist

feat(core): inject src-tauri/Info.plist file on dev and merge on bundle, closes #1570 #2338 (#2444)

2021-08-15 21:36:43 -03:00

tauri.conf.json

chore: fix ci and cleanup leftovers (#6925)

2023-05-13 13:48:28 +03:00