Merge branch 'master' of github.com:Plume-org/Plume

This commit is contained in:
Bat
2018-06-21 11:31:17 +01:00
29 changed files with 333 additions and 214 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
#![feature(plugin, custom_derive, decl_macro, iterator_find_map)]
#![feature(plugin, custom_derive, decl_macro, iterator_find_map, iterator_flatten)]
#![plugin(rocket_codegen)]
extern crate activitypub;
@@ -8,7 +8,6 @@ extern crate base64;
extern crate bcrypt;
extern crate chrono;
extern crate colored;
extern crate comrak;
extern crate failure;
#[macro_use]
extern crate failure_derive;
@@ -23,6 +22,7 @@ extern crate dotenv;
#[macro_use]
extern crate lazy_static;
extern crate openssl;
extern crate pulldown_cmark;
extern crate reqwest;
extern crate rocket;
extern crate rocket_contrib;