diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 13:59:09 -0500 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 13:59:09 -0500 |
commit | c71b1bb92cc57e74ef98fd2def486f5e82a12586 (patch) | |
tree | 95600a7a6a99ba7bc4a4cf2d1db3466747559a67 /pkgs/development/web/cog | |
parent | bd7a6594055ef1024c2f477c4c222202af1d5e68 (diff) | |
parent | 1e178abc9465d8af896666a9a7e170229dc1a1b2 (diff) |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/jenkins-job-builder/default.nix pkgs/development/python-modules/snowflake-connector-python/default.nix
Diffstat (limited to 'pkgs/development/web/cog')
0 files changed, 0 insertions, 0 deletions