diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-02-14 09:53:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-14 09:53:03 +0000 |
commit | 200610b849c0aeb174a63e7526b7376aa8a339bf (patch) | |
tree | f57988f969df0344ef355473653daf0939a0d402 /pkgs/applications/editors/apostrophe | |
parent | fa169bb239d7b2d860af851573569182ee5e0127 (diff) | |
parent | 46cc80cc78abdacca55f036a4f0341b96d660255 (diff) | |
download | nixpkgs-200610b849c0aeb174a63e7526b7376aa8a339bf.tar nixpkgs-200610b849c0aeb174a63e7526b7376aa8a339bf.tar.gz nixpkgs-200610b849c0aeb174a63e7526b7376aa8a339bf.tar.bz2 nixpkgs-200610b849c0aeb174a63e7526b7376aa8a339bf.tar.lz nixpkgs-200610b849c0aeb174a63e7526b7376aa8a339bf.tar.xz nixpkgs-200610b849c0aeb174a63e7526b7376aa8a339bf.tar.zst nixpkgs-200610b849c0aeb174a63e7526b7376aa8a339bf.zip |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/libraries/gtest/default.nix pkgs/development/libraries/hidapi/default.nix
Diffstat (limited to 'pkgs/applications/editors/apostrophe')
0 files changed, 0 insertions, 0 deletions