Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 06:46:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolved merge conflict in CHANGELOG

Browse Source
This commit is contained in:
B. Petersen
2023-04-04 17:09:53 +02:00
parent 2ab7a37d85 185a0193cc
commit 966f863926
12 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "deltachat"
version = "1.112.5"
version = "1.112.6"
edition = "2021"
license = "MPL-2.0"
rust-version = "1.65"
@@ -51,7 +51,11 @@ futures = "0.3"
futures-lite = "1.12.0"
hex = "0.4.0"
humansize = "2"
<<<<<<< HEAD
image = { version = "0.24.6", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
=======
image = { version = "0.24.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
>>>>>>> stable-1.112
iroh = { version = "0.4.1", default-features = false }
kamadak-exif = "0.5"
lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }