Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/develop' into feature/ddw-637-ad…

…d-timestamp-for-paper-wallet-pdf-name
  • Loading branch information...
daniloprates committed May 13, 2019
2 parents 137694d + 4fa1a9c commit ead9b5f07041cf7238ff55beccce04bd482e5e3a
Showing with 2 additions and 0 deletions.
  1. +1 −0 default.nix
  2. +1 −0 installers/nix/nix-installer.nix
@@ -279,6 +279,7 @@ let
mkdir -p etc
cat /etc/hosts > etc/hosts
cat /etc/nsswitch.conf > etc/nsswitch.conf
cat /etc/localtime > etc/localtime
cat /etc/machine-id > etc/machine-id
cat /etc/resolv.conf > etc/resolv.conf
@@ -64,6 +64,7 @@ let
mkdir -p etc
cat /etc/hosts > etc/hosts
cat /etc/nsswitch.conf > etc/nsswitch.conf
cat /etc/localtime > etc/localtime
cat /etc/machine-id > etc/machine-id
cat /etc/resolv.conf > etc/resolv.conf

0 comments on commit ead9b5f

Please sign in to comment.
You can’t perform that action at this time.