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,3 +1,5 @@
+#![allow(proc_macro_derive_resolution_fallback)] // This can be removed after diesel-1.4
+
 extern crate activitypub;
 extern crate ammonia;
 extern crate bcrypt;