Merge remote-tracking branch 'origin/main' into sqlstore

# Conflicts:
#	Cargo.lock
#	taskchampion/Cargo.toml
This commit is contained in:
dbr 2021-06-15 19:49:36 +10:00
commit 2f533d2f3a
74 changed files with 3491 additions and 861 deletions

View file

@ -21,7 +21,10 @@ ureq = "^2.1.0"
log = "^0.4.14"
tindercrypt = { version = "^0.2.2", default-features = false }
rusqlite = { version = "0.25", features = ["bundled"] }
strum = "0.21"
strum_macros = "0.21"
[dev-dependencies]
proptest = "^1.0.0"
tempfile = "3"
rstest = "0.10"