Revert "Revert "Merge master into staging-next""

In 87a19e9048 I merged staging-next into master using the GitHub gui as intended. In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master. Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master. This reverts commit 0be87c7979.
2020-02-05 19:41:25 +01:00
parent 873e6a4e65
commit 419bc0a4cd
28 changed files with 297 additions and 422 deletions
@@ -244,7 +244,7 @@ rec {
     Also note that Nix treats strings as a list of bytes and thus doesn't
     handle unicode.

-     Type: stringtoCharacters :: string -> [string]
+     Type: stringToCharacters :: string -> [string]

     Example:
       stringToCharacters ""