diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-08 02:07:34 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-08 02:07:34 +0100 |
commit | e6c0c98940bc72280216639cd9fb16745b7e1103 (patch) | |
tree | 365c0fb567ff279f2475445a8ba001776629df0e /pkgs/servers/misc/subsonic | |
parent | 5c072a088d7b0efd3a8185953fe21efcd6c1d94a (diff) | |
parent | 9414948a5a19463acce5a7f2b2206c39ecb6359f (diff) | |
download | nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.gz nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.bz2 nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.lz nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.xz nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.zst nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.zip |
Merge branch 'master' into staging-next
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
Diffstat (limited to 'pkgs/servers/misc/subsonic')
0 files changed, 0 insertions, 0 deletions