Merge branch 'release/3.2.0-alpha'

Merge branch 'master' into develop
Bump guzzlehttp/psr7 from 1.9.0 to 1.9.1 (#436 )
2023-04-22 23:21:32 +02:00 · 2023-04-22 23:16:52 +02:00 · 2023-04-19 23:47:18 +02:00 · 2023-03-30 21:46:49 +02:00 · 2023-03-30 21:46:39 +02:00 · 2023-03-30 21:41:08 +02:00
15 changed files with 91 additions and 101 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -9,8 +9,9 @@ jobs:
    strategy:
      matrix:
        php-version:
-          - '7.3'
          - '7.4'
+          - '8.0'
+          - '8.1'
    steps:
      - uses: actions/checkout@v2
      - name: Use PHP ${{ matrix.php-version }}
--- a/4
+++ b/4
@ -1,7 +1,6 @@
-FROM php:7.3-apache
+FROM php:7.4-apache
 RUN apt-get update
 RUN apt-get install -y libicu-dev xz-utils git python libgmp-dev unzip ffmpeg
-RUN docker-php-ext-install mbstring
 RUN docker-php-ext-install intl
 RUN docker-php-ext-install gmp
 RUN a2enmod rewrite
@ -12,4 +11,5 @@ RUN php composer.phar check-platform-reqs --no-dev
 RUN php composer.phar install --prefer-dist --no-progress --no-dev --optimize-autoloader
 RUN mkdir /var/www/html/templates_c/
 RUN chmod 770 -R /var/www/html/templates_c/
+RUN chown www-data -R /var/www/html/templates_c/
 ENV CONVERT=1
--- a/classes/Config.php
+++ b/classes/Config.php
@ -24,84 +24,92 @@ class Config
     *
     * @var string
     */
-    public $youtubedl = 'vendor/ytdl-org/youtube-dl/youtube_dl/__main__.py';
+    public string $youtubedl = 'vendor/yt-dlp/yt-dlp/yt_dlp/__main__.py';

    /**
     * python binary path.
     *
     * @var string
     */
-    public $python = '/usr/bin/python';
+    public string $python = '/usr/bin/python';

    /**
     * youtube-dl parameters.
     *
     * @var string[]
     */
-    public $params = ['--no-warnings', '--ignore-errors', '--flat-playlist', '--restrict-filenames', '--no-playlist'];
+    public array $params = [
+        '--no-warnings',
+        '--ignore-errors',
+        '--flat-playlist',
+        '--restrict-filenames',
+        '--no-playlist',
+        '--use-extractors',
+        'default,-generic',
+    ];

    /**
     * Enable audio conversion.
     *
     * @var bool
     */
-    public $convert = false;
+    public bool $convert = false;

    /**
     * Enable advanced conversion mode.
     *
     * @var bool
     */
-    public $convertAdvanced = false;
+    public bool $convertAdvanced = false;

    /**
     * List of formats available in advanced conversion mode.
     *
     * @var string[]
     */
-    public $convertAdvancedFormats = ['mp3', 'avi', 'flv', 'wav'];
+    public array $convertAdvancedFormats = ['mp3', 'avi', 'flv', 'wav'];

    /**
     * ffmpeg binary path.
     *
     * @var string
     */
-    public $ffmpeg = '/usr/bin/ffmpeg';
+    public string $ffmpeg = '/usr/bin/ffmpeg';

    /**
     * Path to the directory that contains the phantomjs binary.
     *
     * @var string
     */
-    public $phantomjsDir = '/usr/bin/';
+    public string $phantomjsDir = '/usr/bin/';

    /**
     * Disable URL rewriting.
     *
     * @var bool
     */
-    public $uglyUrls = false;
+    public bool $uglyUrls = false;

    /**
     * Stream downloaded files trough server?
     *
     * @var bool
     */
-    public $stream = false;
+    public bool $stream = false;

    /**
     * Allow to remux video + audio?
     *
     * @var bool
     */
-    public $remux = false;
+    public bool $remux = false;

    /**
     * MP3 bitrate when converting (in kbit/s).
     *
     * @var int
     */
-    public $audioBitrate = 128;
+    public int $audioBitrate = 128;

    /**
     * ffmpeg logging level.
@ -109,21 +117,21 @@ class Config
     *
     * @var string
     */
-    public $ffmpegVerbosity = 'error';
+    public string $ffmpegVerbosity = 'error';

    /**
     * App name.
     *
     * @var string
     */
-    public $appName = 'AllTube Download';
+    public string $appName = 'AllTube Download';

    /**
     * Generic formats supported by youtube-dl.
     *
     * @var string[]
     */
-    public $genericFormats = [
+    public array $genericFormats = [
        'best/bestvideo' => 'Best',
        'bestvideo+bestaudio' => 'Remux best video with best audio',
        'worst/worstvideo' => 'Worst',
@ -134,21 +142,21 @@ class Config
     *
     * @var bool
     */
-    public $debug = false;
+    public bool $debug = false;

    /**
     * Default to audio.
     *
     * @var bool
     */
-    public $defaultAudio = false;
+    public bool $defaultAudio = false;

    /**
     * Disable audio conversion from/to seeker.
     *
     * @var bool
     */
-    public $convertSeek = true;
+    public bool $convertSeek = true;

    /**
     * Config constructor.
--- a/classes/Controller/BaseController.php
+++ b/classes/Controller/BaseController.php
@ -30,21 +30,21 @@ abstract class BaseController
     *
     * @var Video
     */
-    protected $video;
+    protected Video $video;

    /**
     * Default youtube-dl format.
     *
     * @var string
     */
-    protected $defaultFormat = 'best/bestvideo';
+    protected string $defaultFormat = 'best/bestvideo';

    /**
     * Slim dependency container.
     *
     * @var ContainerInterface
     */
-    protected $container;
+    protected ContainerInterface $container;

    /**
     * Config instance.
--- a/classes/Locale.php
+++ b/classes/Locale.php
@ -60,7 +60,7 @@ class Locale
     */
    public function getFullName(): string
    {
-        return PHPLocale::getDisplayName($this->getIso15897(), $this->getIso15897());
+        return mb_convert_case(PHPLocale::getDisplayName($this->getIso15897(), $this->getIso15897()), MB_CASE_TITLE);
    }

    /**
--- a/classes/LocaleManager.php
+++ b/classes/LocaleManager.php
@ -27,14 +27,14 @@ class LocaleManager
     *
     * @var Locale|null
     */
-    private $curLocale;
+    private ?Locale $curLocale = null;

    /**
     * Session segment used to store session variables.
     *
     * @var Segment
     */
-    private $sessionSegment;
+    private Segment $sessionSegment;

    /**
     * Default locale.
@ -48,7 +48,7 @@ class LocaleManager
     *
     * @var Translator
     */
-    private $translator;
+    private Translator $translator;

    /**
     * LocaleManager constructor.
--- a/classes/Robo/Plugin/Commands/ReleaseCommand.php
+++ b/classes/Robo/Plugin/Commands/ReleaseCommand.php
@ -26,6 +26,7 @@ class ReleaseCommand extends Tasks
        $gitTask = $this->taskExec('git');
        $result = $gitTask
            ->arg('describe')
+            ->interactive(false)
            ->run();

        $tmpDir = $this->_tmpDir();
--- a/classes/Stream/PlaylistArchiveStream.php
+++ b/classes/Stream/PlaylistArchiveStream.php
@ -24,7 +24,7 @@ class PlaylistArchiveStream extends ZipArchive implements StreamInterface
     *
     * @var Video[]
     */
-    private $videos = [];
+    private array $videos = [];

    /**
     * Stream used to store data before it is sent to the browser.
@ -38,21 +38,21 @@ class PlaylistArchiveStream extends ZipArchive implements StreamInterface
     *
     * @var StreamInterface
     */
-    protected $curVideoStream;
+    protected StreamInterface $curVideoStream;

    /**
     * True if the archive is complete.
     *
     * @var bool
     */
-    private $isComplete = false;
+    private bool $isComplete = false;

    /**
     * Downloader object.
     *
     * @var Downloader
     */
-    protected $downloader;
+    protected Downloader $downloader;

    /**
     * PlaylistArchiveStream constructor.
--- a/classes/Stream/YoutubeChunkStream.php
+++ b/classes/Stream/YoutubeChunkStream.php
@ -20,7 +20,7 @@ class YoutubeChunkStream implements StreamInterface
     *
     * @var ResponseInterface
     */
-    private $response;
+    private ResponseInterface $response;

    /**
     * YoutubeChunkStream constructor.
--- a/composer.json
+++ b/composer.json
@ -18,7 +18,7 @@
    }
  ],
  "require": {
-    "php": ">=7.3",
+    "php": ">=7.4",
    "ext-intl": "*",
    "ext-json": "*",
    "aura/session": "^2.1",
@ -31,13 +31,13 @@
    "mathmarques/smarty-view": "^1.2",
    "oomphinc/composer-installers-extender": "^2.0",
    "paragonie/csp-builder": "^2.5",
-    "rinvex/countries": "^6.1",
+    "rinvex/countries": "^7.3",
    "rudloff/alltube-library": "^0.1.3",
    "symfony/finder": "^5.4",
    "symfony/translation": "^4.0",
    "symfony/yaml": "^4.0",
    "webfontkit/open-sans": "^1.0",
-    "ytdl-org/youtube-dl": "^2021.12",
+    "yt-dlp/yt-dlp": "^2023.03",
    "zonuexe/http-accept-language": "^0.4.1"
  },
  "require-dev": {
@ -62,11 +62,11 @@
    {
      "type": "package",
      "package": {
-        "name": "ytdl-org/youtube-dl",
-        "version": "2021.12.17",
+        "name": "yt-dlp/yt-dlp",
+        "version": "2023.03.04",
        "dist": {
          "type": "tar",
-          "url": "https://yt-dl.org/downloads/2021.12.17/youtube-dl-2021.12.17.tar.gz"
+          "url": "https://github.com/yt-dlp/yt-dlp/releases/download/2023.03.04/yt-dlp.tar.gz"
        }
      }
    }
@ -92,7 +92,7 @@
      "phpro/grumphp": true
    },
    "platform": {
-      "php": "7.3.11"
+      "php": "7.4.33"
    },
    "sort-packages": true
  },
@ -108,11 +108,7 @@
    "installer-types": [
      "library"
    ],
-    "patches": {
-      "ytdl-org/youtube-dl": {
-        "Disable the generic extractor": "patches/youtube-dl-disable-generic.diff"
-      }
-    }
+    "patches": {}
  },
  "scripts": {
    "lint": "grumphp run --ansi",
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "6f7b900aafa876f17e0815ca6fa044a5",
+    "content-hash": "02f288a60af3784e20ca7e1ba9afac4a",
    "packages": [
        {
            "name": "aura/session",
@ -701,16 +701,16 @@
        },
        {
            "name": "guzzlehttp/psr7",
-            "version": "1.9.0",
+            "version": "1.9.1",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
+                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
-                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b",
+                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b",
                "shasum": ""
            },
            "require": {
@ -729,11 +729,6 @@
                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
            },
            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9-dev"
-                }
-            },
            "autoload": {
                "files": [
                    "src/functions_include.php"
@ -791,7 +786,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
+                "source": "https://github.com/guzzle/psr7/tree/1.9.1"
            },
            "funding": [
                {
@ -807,7 +802,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-06-20T21:43:03+00:00"
+            "time": "2023-04-17T16:00:37+00:00"
        },
        {
            "name": "j0k3r/httplug-ssrf-plugin",
@ -1895,25 +1890,25 @@
        },
        {
            "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                }
            },
            "autoload": {
@ -1942,9 +1937,9 @@
                "response"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/1.1"
            },
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:50:52+00:00"
        },
        {
            "name": "psr/log",
@ -2042,25 +2037,24 @@
        },
        {
            "name": "rinvex/countries",
-            "version": "v6.1.2",
+            "version": "v7.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/rinvex/countries.git",
-                "reference": "0dd9da817c1faa33429fe56b8ba059fdabe6e0fe"
+                "reference": "4696d23976e27d6cedf7e55db3fa24e11924b727"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/rinvex/countries/zipball/0dd9da817c1faa33429fe56b8ba059fdabe6e0fe",
-                "reference": "0dd9da817c1faa33429fe56b8ba059fdabe6e0fe",
+                "url": "https://api.github.com/repos/rinvex/countries/zipball/4696d23976e27d6cedf7e55db3fa24e11924b727",
+                "reference": "4696d23976e27d6cedf7e55db3fa24e11924b727",
                "shasum": ""
            },
            "require": {
-                "php": "^7.2.0"
+                "php": "^7.4.0 || ^8.0.0"
            },
            "require-dev": {
-                "codedungeon/phpunit-result-printer": "^0.26.0",
-                "laravel/helpers": "^1.1.0",
-                "phpunit/phpunit": "^8.3.0"
+                "codedungeon/phpunit-result-printer": "^0.30.0",
+                "phpunit/phpunit": "^9.5.0"
            },
            "type": "library",
            "extra": {
@ -2122,7 +2116,7 @@
                "issues": "https://github.com/rinvex/countries/issues",
                "source": "https://github.com/rinvex/countries"
            },
-            "time": "2020-03-13T18:04:45+00:00"
+            "time": "2020-12-25T01:36:24+00:00"
        },
        {
            "name": "rudloff/alltube-library",
@ -2258,16 +2252,16 @@
        },
        {
            "name": "smarty/smarty",
-            "version": "v4.3.0",
+            "version": "v4.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "c02e9e135ea719b91f457a0072748ded0e852e7d"
+                "reference": "e28cb0915b4e3749bf57d4ebae2984e25395cfe5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/c02e9e135ea719b91f457a0072748ded0e852e7d",
-                "reference": "c02e9e135ea719b91f457a0072748ded0e852e7d",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/e28cb0915b4e3749bf57d4ebae2984e25395cfe5",
+                "reference": "e28cb0915b4e3749bf57d4ebae2984e25395cfe5",
                "shasum": ""
            },
            "require": {
@ -2318,9 +2312,9 @@
            "support": {
                "forum": "https://github.com/smarty-php/smarty/discussions",
                "issues": "https://github.com/smarty-php/smarty/issues",
-                "source": "https://github.com/smarty-php/smarty/tree/v4.3.0"
+                "source": "https://github.com/smarty-php/smarty/tree/v4.3.1"
            },
-            "time": "2022-11-22T21:47:32+00:00"
+            "time": "2023-03-28T19:47:03+00:00"
        },
        {
            "name": "symfony/console",
@ -3773,11 +3767,11 @@
            "time": "2014-08-20T20:43:34+00:00"
        },
        {
-            "name": "ytdl-org/youtube-dl",
-            "version": "2021.12.17",
+            "name": "yt-dlp/yt-dlp",
+            "version": "2023.03.04",
            "dist": {
                "type": "tar",
-                "url": "https://yt-dl.org/downloads/2021.12.17/youtube-dl-2021.12.17.tar.gz"
+                "url": "https://github.com/yt-dlp/yt-dlp/releases/download/2023.03.04/yt-dlp.tar.gz"
            },
            "type": "library"
        },
@ -9359,13 +9353,13 @@
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
-        "php": ">=7.3",
+        "php": ">=7.4",
        "ext-intl": "*",
        "ext-json": "*"
    },
    "platform-dev": [],
    "platform-overrides": {
-        "php": "7.3.11"
+        "php": "7.4.33"
    },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
--- a/config/config.example.yml
+++ b/config/config.example.yml
@ -1,6 +1,6 @@
 ---
 # Path to your youtube-dl binary
-youtubedl: vendor/ytdl-org/youtube-dl/youtube_dl/__main__.py
+youtubedl: vendor/yt-dlp/yt-dlp/yt_dlp/__main__.py

 # Path to your python binary
 python: /usr/bin/python
@ -12,6 +12,8 @@ params:
    - --flat-playlist
    - --restrict-filenames
    - --no-playlist
+    - --use-extractors
+    - default,-generic

 # True to enable audio conversion
 convert: false
--- a/patches/youtube-dl-disable-generic.diff
+++ b/patches/youtube-dl-disable-generic.diff
@ -1,12 +0,0 @@
-diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
-index 18d8dbcd6..4d3edfac3 100644
--- a/youtube_dl/extractor/__init__.py
-+++ b/youtube_dl/extractor/__init__.py
-@@ -13,7 +13,6 @@ except ImportError:
-         for name, klass in globals().items()
-         if name.endswith('IE') and name != 'GenericIE'
-     ]
-    _ALL_CLASSES.append(GenericIE)
- 
- 
- def gen_extractor_classes():
--- a/templates/inc/header.tpl
+++ b/templates/inc/header.tpl
@ -18,7 +18,7 @@
                                {if $supportedLocale->getCountry()}
                                    {$supportedLocale->getCountry()->getEmoji()}
                                {/if}
-                                {$supportedLocale->getFullName()|ucfirst}
+                                {$supportedLocale->getFullName()}
                            </a>
                        </li>
                    {/if}
--- a/tests/LocaleTest.php
+++ b/tests/LocaleTest.php
@ -54,7 +54,7 @@ class LocaleTest extends ContainerTest
     */
    public function testGetFullName()
    {
-        $this->assertEquals('français (France)', $this->localeObject->getFullName());
+        $this->assertEquals('Français (France)', $this->localeObject->getFullName());
    }

    /**
Author	SHA1	Message	Date
Pierre Rudloff	ec95a8f1b7	Merge branch 'release/3.2.0-alpha'	2023-04-22 23:21:32 +02:00
Pierre Rudloff	a9da2314af	Merge branch 'master' into develop	2023-04-22 23:16:52 +02:00
dependabot[bot]	fcb3d2e84c	Bump guzzlehttp/psr7 from 1.9.0 to 1.9.1 (#436 ) Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 1.9.0 to 1.9.1. - [Release notes](https://github.com/guzzle/psr7/releases) - [Changelog](https://github.com/guzzle/psr7/blob/1.9.1/CHANGELOG.md) - [Commits](https://github.com/guzzle/psr7/compare/1.9.0...1.9.1) --- updated-dependencies: - dependency-name: guzzlehttp/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-04-19 23:47:18 +02:00
Pierre Rudloff	f09b7b43d7	Merge branch 'master' into develop	2023-03-30 21:46:49 +02:00
dependabot[bot]	a4146a63c8	Bump smarty/smarty from 4.3.0 to 4.3.1 (#431 ) Bumps [smarty/smarty](https://github.com/smarty-php/smarty) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/smarty-php/smarty/releases) - [Changelog](https://github.com/smarty-php/smarty/blob/master/CHANGELOG.md) - [Commits](https://github.com/smarty-php/smarty/compare/v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: smarty/smarty dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-03-30 21:46:39 +02:00
Pierre Rudloff	3e45f19682	Switch to yt-dlp (fixes #432 ) youtube-dl has no new release since 2021	2023-03-30 21:41:08 +02:00
Pierre Rudloff	9564764633	ucfirst Smarty modifier is deprecated See https://github.com/smarty-php/smarty/issues/813	2023-03-21 20:25:47 +01:00
Pierre Rudloff	71647158d3	Stronger typying now that we target PHP 7.4	2023-03-21 20:20:14 +01:00
Pierre Rudloff	b23ce88be8	fixup! fix dockerfile permission issue (#426 )	2023-03-21 20:07:31 +01:00
Pierre Rudloff	b52a582539	Stop supporting PHP 7.3 (#430 ) It is unmaintained	2023-03-21 20:07:08 +01:00
Pierre Rudloff	7bfe55fff6	"git describe" needs to be non-interactive so we can get its output	2023-03-11 14:37:28 +01:00
Pierre Rudloff	9d8bff3c42	Updated robo to 3.0 Various dependencies update -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAAZcAAAAHc3NoLXJzYQAAAAMBAAEAAAGBAJ1cjUGHGZz2Xlnuxq9dZ2 wA/r2ineVomdWGZBiq9GYcfUirCaArD49YsXbdQKkcHhrQ+gMUNQP4iOWjuPBG5WAPrORz LXUXwmk0UHdEPdJ2LymHXQsyYyHaldikt3gfsiD0ny/Uf3V9lL3vnrEUhQAxIYN87RaQun OL0S5y5wOp3vr8DwMlvAUDfZbzZgJ56nzVWRElVLNuQCQSZta9imqnJpzHQf4KTMut191S hgQjBA0TWeOAqGVeIMOctLqNY1gL5QUSyg5RYmBHjResH8tnOkfPElE1Ih19MCCQ9Eaubw g1cS6Ls6LgbTIdvyMud6ep+0iF3ifj0g7w1X6NvQfQp0JcWkU3eXyQfOGjdePZG9Kn+27Q EeMv47cyCGuMdGbpbFoD/yR82T2n78rPmxbYEnPnJSmuy30Wi8reYeaQUP2z+Krexk5tGQ a/thYIk1yhN+Ui3nSr78sATwgqateS6VvNw8nY315PUzmf4Bk0kDCnj7Q7z4wenHAhkayU FwAAAANnaXQAAAAAAAAABnNoYTUxMgAAAZQAAAAMcnNhLXNoYTItNTEyAAABgG9ULjUS0q UP06d9PYGfxYL3aADqwS5eczhU4B3QsUD5aab3q1qbqUfkRZ7Gvhy3lK4UXJvyy5kGC5Ba 1u+WBlCuX4ki6Vgum0skw612V5cKOdcr5eDDc5jYRPwNd3P/Aa/YoBc1Ev4a1Ozlj9g2MR 2XmDHxaoW6tzjsGYgPhihr1eIDAQm+BxeccDdjs9lsSiHfpcW6Vg7MdBzxZFPBEbpeEp6I WsvWVntjwBKFXG+cx/nBq+HNwdBHOq5ncE3eLHG7loNb5O3cof9t8Y91z+P6Cnw8r6lulu RIOgBfv/fIgZTIXq/UZ/bjUmbDrpCfDm2mtSi57X4Iaj5ZBXAu0tGwl46ZhGjDnwxBcBGn DcaLWUhVL19JEhKwq3APdV++ZEpeU4+G4VbuYvjbLe3kT/S/AMaw/5H1D7CFPQB30AeLbl l+1QWoc3bW8rY0FqBHpaFl5mgvu3VL23H8O+VhrzueM/CK22aaBt86bvUVHQnqLnQQ82xo oARjISpOfp0xjw== -----END SSH SIGNATURE----- gpgsig -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAAZcAAAAHc3NoLXJzYQAAAAMBAAEAAAGBAJ1cjUGHGZz2Xlnuxq9dZ2 wA/r2ineVomdWGZBiq9GYcfUirCaArD49YsXbdQKkcHhrQ+gMUNQP4iOWjuPBG5WAPrORz LXUXwmk0UHdEPdJ2LymHXQsyYyHaldikt3gfsiD0ny/Uf3V9lL3vnrEUhQAxIYN87RaQun OL0S5y5wOp3vr8DwMlvAUDfZbzZgJ56nzVWRElVLNuQCQSZta9imqnJpzHQf4KTMut191S hgQjBA0TWeOAqGVeIMOctLqNY1gL5QUSyg5RYmBHjResH8tnOkfPElE1Ih19MCCQ9Eaubw g1cS6Ls6LgbTIdvyMud6ep+0iF3ifj0g7w1X6NvQfQp0JcWkU3eXyQfOGjdePZG9Kn+27Q EeMv47cyCGuMdGbpbFoD/yR82T2n78rPmxbYEnPnJSmuy30Wi8reYeaQUP2z+Krexk5tGQ a/thYIk1yhN+Ui3nSr78sATwgqateS6VvNw8nY315PUzmf4Bk0kDCnj7Q7z4wenHAhkayU FwAAAANnaXQAAAAAAAAABnNoYTUxMgAAAZQAAAAMcnNhLXNoYTItNTEyAAABgJrUC15ar9 VQj/LfmlMNN7+ec1D17Bk4q7/XH27FgUyRCHXLFS4hm0GhtjIZAaA9jErCt23NcAFan7cI WQyL6AAqqq/DOshmaYXY7Zj+5vQXbiJjDcGu1IsdGEFAA/DIAr721vxfKrri3aArucWK3T ymPliFOqhL1qyxKqFxrADJmcqZeL9XzoQ0RHxayyN8XRYf5Px8vrmxkgvcI7wiy2W554qk 3DR7UlcHX/rg1H8B6W+PO7WK0JWdFoRRR/EErmo2VzCfEo/3USxJPPNUrhEv6K02WUVzib 1ac6cjuIsb0xHE2zVQO6hgpIH9L73Ef6pOUcEnlu2zqE1FPgJc5u0q5MDXQyNMGTtcKk8U /UfNJw55umSMneOTHnhZ3AfmNYAmxWGGfwpbc2Y/rrOdBXWVhJzoPZWRKuOANk65+9NIjC 20KLEeZSvodADv+f+WGrsVDHB2NUKLG5YuuWANH/s07a9Mm7I/XedWgRE7wh/WzfT93XKn BwDuEKTCMHOZwQ== -----END SSH SIGNATURE----- Merge tag '3.1.1' into develop Updated robo to 3.0 Various dependencies update	2023-03-11 14:32:35 +01:00