Skip to content
Commit 1b871943 authored by Matt McHenry's avatar Matt McHenry
Browse files

Merge remote-tracking branch 'channels/nixos-unstable' into jdk-13 

Conflicts:
	pkgs/development/compilers/adoptopenjdk-bin/sources.json
          -- keep newer adoptopenjdk versions from HEAD^2
parents d00559eb 82b54d49
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