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

2018-09-08 20:32:12 +01:00
parent f1d5865a16 fe7f87c47f
commit 0a70ff2594
17 changed files with 1096 additions and 736 deletions
@@ -1,4 +1,4 @@
-#![feature(custom_derive, decl_macro, plugin)]
+#![feature(custom_derive, plugin, decl_macro)]
 #![plugin(rocket_codegen)]

 extern crate activitypub;
@@ -13,6 +13,7 @@ extern crate heck;
 extern crate multipart;
 extern crate plume_common;
 extern crate plume_models;
+#[macro_use]
 extern crate rocket;
 extern crate rocket_contrib;
 extern crate rocket_csrf;