Commit 4cb4c927 authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch 'master' into x/lte-multiru

* master: (45 commits)
  stack/slapos: restore an old pin of importlib-metadata for py2
  component/apache-php: remove code pushed by mistake
  component/perl: version up 5.38.0
  component/fluent-bit: version up 2.1.10
  component/flex: version up 2.6.4
  component/apache-php: add missing xz in PATH
  component/ca-certificate: simplify pre-make-hook
  software/rapid-cdn: correct small typos in README.rst
  software/ors-amarisoft: Update changelog.rst
  software/ors-amarisoft: update RRH firmware to V1004.006
  software/ors-amarisoft: add reset function for RRH
  stack/slapos: version up nbconvert and dependencies
  software/slapos-sr-testing: correctly disallow usage of system python3
  software/erp5/upgrade_test: update old software url with backported fixes
  component/ca-certificates: don't use implicit `python`
  component/opencv: explicitly use slapos python
  component/open62541: add slapos python3 in PATH
  component/gtk-3: add slapos python3 in PATH
  component/gdk-pixbuf: add slapos python3 in PATH
  component/inkscape: add slapos python3 in PATH
  ...
parents 027b579a 97d60836
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment