Merge master into staging-next

2021-03-19 18:17:01 +01:00
parent c804f22a81 fe7df3f3ff
commit 1ecb97eae9
22 changed files with 108 additions and 49 deletions
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -147,7 +147,6 @@ where they are known to differ. But there are ways to customize the argument:
     };
   }
   ```
-
   will result in:
   ```shell
   --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""}