Merge branch 'federation' into dev_1

[lemmy.git] / server / Cargo.toml

diff --git a/server/Cargo.toml b/server/Cargo.toml
index 6c50c6953e14bdf410a0fbac1ceff0acfa887944..828230572fba57264ed16cefc06bff5d30c668d8 100644 (file)
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -5,24 +5,32 @@ authors = ["Dessalines <happydooby@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-diesel = { version = "1.4.2", features = ["postgres","chrono"] }
+diesel = { version = "1.4.2", features = ["postgres","chrono", "r2d2"] }
 diesel_migrations = "1.4.0"
-dotenv = "0.14.1"
-bcrypt = "0.5.0"
-activitypub = "0.1.5"
+dotenv = "0.15.0"
+bcrypt = "0.6.1"
+activitypub = "0.2.0"
 chrono = { version = "0.4.7", features = ["serde"] }
 failure = "0.1.5"
-serde_json = "1.0.40"
+serde_json = { version = "1.0.45", features = ["preserve_order"]}
 serde = { version = "1.0.94", features = ["derive"] }
-actix = "0.8.3"
-actix-web = "1.0"
-actix-files = "0.1.3"
-actix-web-actors = "1.0"
-env_logger = "0.6.2"
-rand = "0.7.0"
-strum = "0.15.0"
-strum_macros = "0.15.0"
-jsonwebtoken = "6.0.1"
-regex = "1.1.9"
+actix = "0.9.0"
+actix-web = "2.0.0"
+actix-files = "0.2.1"
+actix-web-actors = "2.0.0"
+actix-rt = "1.0.0"
+env_logger = "0.7.1"
+rand = "0.7.3"
+strum = "0.17.1"
+strum_macros = "0.17.1"
+jsonwebtoken = "7.0.1"
+regex = "1.3.4"
 lazy_static = "1.3.0"
-
+lettre = "0.9.2"
+lettre_email = "0.9.2"
+sha2 = "0.8.1"
+rss = "1.9.0"
+htmlescape = "0.3.1"
+config = "0.10.1"
+hjson = "0.8.2"
+reqwest = "0.9.24"
\ No newline at end of file