Merge branch 'master' of origin/master
1 file changed, 1 insertion(+), 0 deletions(-)
changed files
M user/trillian.nix → user/trillian.nix
@@ -9,6 +9,7 @@ ./settings/emacs.nix ./settings/git.nix ./settings/gnupg.nix ./settings/javascript.nix + ./settings/ledger.nix ./settings/nixpkgs.nix ./settings/satoshipay.nix ./settings/tabnine.nix