Skip to content

Commit

Permalink
Merge branch 'main' into release-plz-2024-06-26T13-01-00Z
Browse files Browse the repository at this point in the history
  • Loading branch information
0xCCF4 committed Sep 3, 2024
2 parents c39a97f + 9ca141a commit 169743d
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto_merge_bots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Dependabot metadata
id: metadata
if: ${{ github.actor == 'dependabot[bot]' }}
uses: dependabot/fetch-metadata@v2.1.0
uses: dependabot/fetch-metadata@v2.2.0
with:
github-token: "${{ github.token }}"

Expand Down
120 changes: 67 additions & 53 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ documentation = "https://docs.rs/photo_sort"
anyhow = "1.0.86"
chrono = "0.4.34"
kamadak-exif = "0.5.5"
clap = { version = "4.5.7", features = ["derive"] }
regex = "1.10.5"
clap = { version = "4.5.16", features = ["derive"] }
regex = "1.10.6"
lazy_static = "1.5.0"
aho-corasick = "1.1.2"
env_logger = "0.11.2"
log = "0.4.20"
filetime = "0.2.23"
env_logger = "0.11.5"
log = "0.4.22"
filetime = "0.2.25"
symlink = "0.1.0"
ffmpeg-next = { version = "7.0.2", optional = true }
ffmpeg-next = { version = "7.0.4", optional = true }

[features]
default = []
Expand Down

0 comments on commit 169743d

Please sign in to comment.