diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-01-08 02:39:35 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-01-08 02:39:35 -0500 |
| commit | 477540469ecaa78e0f5a90d6a2479a3e3a521f4e (patch) | |
| tree | 6f3ed9257017a33cfd2e54cda2bf728b44f32097 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | fe00d45c50de7dc3a4fe3803f13b5b5119244d2f (diff) | |
| parent | 97864e984d89248e74b13be175a1cfe9e16d984e (diff) | |
Merge branch 'master' into staging-next
Conflicts:
pkgs/development/python-modules/gradient-utils/default.nix
pkgs/development/python-modules/gradient/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions