summaryrefslogtreecommitdiffstats
path: root/server/Cargo.toml
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2020-03-28 15:41:42 -0400
committerDessalines <tyhou13@gmx.com>2020-03-28 15:41:42 -0400
commit5ca466117d63ec479bc886b2cff389aa1f0918dc (patch)
treee8b7deaa84c264374e8f1736beb3225498fa4ece /server/Cargo.toml
parent945fd8331beb41af40cf73be8f0e61cba5c74be0 (diff)
parentac6dc65342319bde26ef408352de19f937500059 (diff)
Merge branch 'master' into federation
Diffstat (limited to 'server/Cargo.toml')
-rw-r--r--server/Cargo.toml14
1 files changed, 7 insertions, 7 deletions
diff --git a/server/Cargo.toml b/server/Cargo.toml
index c694c88c..83dfb43e 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -8,12 +8,12 @@ edition = "2018"
diesel = { version = "1.4.2", features = ["postgres","chrono", "r2d2", "64-column-tables"] }
diesel_migrations = "1.4.0"
dotenv = "0.15.0"
-bcrypt = "0.6.1"
activitystreams = "0.5.0-alpha.10"
+bcrypt = "0.6.2"
chrono = { version = "0.4.7", features = ["serde"] }
failure = "0.1.5"
-serde_json = { version = "1.0.45", features = ["preserve_order"]}
-serde = { version = "1.0.94", features = ["derive"] }
+serde_json = { version = "1.0.48", features = ["preserve_order"]}
+serde = { version = "1.0.105", features = ["derive"] }
actix = "0.9.0"
actix-web = "2.0.0"
actix-files = "0.2.1"
@@ -22,10 +22,10 @@ actix-rt = "1.0.0"
log = "0.4.0"
env_logger = "0.7.1"
rand = "0.7.3"
-strum = "0.17.1"
-strum_macros = "0.17.1"
+strum = "0.18.0"
+strum_macros = "0.18.0"
jsonwebtoken = "7.0.1"
-regex = "1.3.4"
+regex = "1.3.5"
lazy_static = "1.3.0"
lettre = "0.9.2"
lettre_email = "0.9.2"
@@ -36,4 +36,4 @@ config = "0.10.1"
hjson = "0.8.2"
url = "2.1.1"
percent-encoding = "2.1.0"
-chttp = "0.5.5"
+isahc = "0.9"