Skip to content
Commit 4ccb7401 authored by John Ericson's avatar John Ericson
Browse files

Merge commit '18aa59b0' from master into staging 

There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
parents 75514175 18aa59b0
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment