diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-08-15 14:34:22 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-08-15 14:34:22 +0200 |
| commit | d39064368a950e646a15d1fdea5bddc96c273c54 (patch) | |
| tree | b9ea21f9ca984d809d7a2e94ec3960524a1a28ff /pkgs/development/python-modules/rangehttpserver | |
| parent | cf21487d22e21fc3e2ee5020704de3271ea1ae6d (diff) | |
| parent | 3ddf00974844982ec62cca209bf67c5efc2b9879 (diff) | |
Merge branch 'master' into staging-next
We are applying a patch to libgpg-error that fixes cross-compilation. On staging-next, we saved the patch locally, while on master we fetched it using fetchpatch, resulting in a merge conflict.
Let’s keep what’s on staging-next, even though fetching patches is generally preferred, to reduce the rebuilds.
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions