diff options
| author | John Ericson <git@JohnEricson.me> | 2019-04-01 00:24:46 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-04-01 00:40:03 -0400 |
| commit | 4ccb74011fc77cb761a3c33ed796724795425420 (patch) | |
| tree | 91e0d95cdfe1023c3de5ff214eba58985e2d2d35 /README.md | |
| parent | 75514175920e1613c8eaf8026b367b48f8b77027 (diff) | |
| parent | 18aa59b0f26fc707e7313f8467e67159e61600c2 (diff) | |
| download | nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.gz nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.bz2 nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.lz nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.xz nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.zst nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.zip | |
Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
There was one conflict in the NixOS manual; I checked that it still built after resolving it.
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions