Commit Graph

3248 Commits

Author SHA1 Message Date
Joakim Erdfelt 7e48d6f0da
Merge pull request #10034 from eclipse/dependabot/maven/jetty-11.0.x/ch.qos.logback-logback-core-1.4.8
Bump logback-core from 1.4.7 to 1.4.8
2023-07-06 07:53:50 -05:00
Joakim Erdfelt f55e4312b9
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-07-06 07:45:57 -05:00
Joakim Erdfelt b3128b642f
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.wildfly.security-wildfly-elytron-2.2.1.Final' into fix/10.0.x/dependency-rollup 2023-07-06 04:57:27 -05:00
Joakim Erdfelt 6fbb40c8af
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.jboss.logging-jboss-logging-3.5.3.Final' into fix/10.0.x/dependency-rollup 2023-07-06 04:57:23 -05:00
Joakim Erdfelt f29e6744e5
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.plexus-plexus-xml-4.0.2' into fix/10.0.x/dependency-rollup 2023-07-06 04:57:13 -05:00
Joakim Erdfelt ba4b2e76da
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.asciidoctor-asciidoctorj-diagram-2.2.9' into fix/10.0.x/dependency-rollup 2023-07-06 04:57:10 -05:00
Joakim Erdfelt f633071582
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.mina-mina-core-2.2.2' into fix/10.0.x/dependency-rollup 2023-07-06 04:57:07 -05:00
Joakim Erdfelt 5e0a1a8fe4
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-war-plugin-3.4.0' into fix/10.0.x/dependency-rollup 2023-07-06 04:57:04 -05:00
Joakim Erdfelt ed54922f44
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-shade-plugin-3.5.0' into fix/10.0.x/dependency-rollup 2023-07-06 04:57:01 -05:00
Joakim Erdfelt 7ba1788a38
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-release-plugin-3.0.1' into fix/10.0.x/dependency-rollup 2023-07-06 04:56:57 -05:00
Joakim Erdfelt b61c0c900c
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-invoker-plugin-3.6.0' into fix/10.0.x/dependency-rollup 2023-07-06 04:56:54 -05:00
Joakim Erdfelt 454e7ac753
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-clean-plugin-3.3.1' into fix/10.0.x/dependency-rollup 2023-07-06 04:56:50 -05:00
Joakim Erdfelt c979c9f5b1
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/commons-io-commons-io-2.13.0' into fix/10.0.x/dependency-rollup 2023-07-06 04:56:47 -05:00
Joakim Erdfelt fdd5ea00d2
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/commons-codec-commons-codec-1.16.0' into fix/10.0.x/dependency-rollup 2023-07-06 04:56:44 -05:00
dependabot[bot] c859925544
Bump plexus-xml from 4.0.0 to 4.0.2
Bumps [plexus-xml](https://github.com/codehaus-plexus/plexus-xml) from 4.0.0 to 4.0.2.
- [Release notes](https://github.com/codehaus-plexus/plexus-xml/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-xml/compare/plexus-xml-4.0.0...plexus-xml-4.0.2)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-xml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:47 +00:00
dependabot[bot] 22ce6275ca
Bump jboss-logging from 3.5.0.Final to 3.5.3.Final
Bumps [jboss-logging](https://github.com/jboss-logging/jboss-logging) from 3.5.0.Final to 3.5.3.Final.
- [Release notes](https://github.com/jboss-logging/jboss-logging/releases)
- [Commits](https://github.com/jboss-logging/jboss-logging/compare/3.5.0.Final...3.5.3.Final)

---
updated-dependencies:
- dependency-name: org.jboss.logging:jboss-logging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:41 +00:00
dependabot[bot] 2d2a0c9fb3
Bump commons-io from 2.12.0 to 2.13.0
Bumps commons-io from 2.12.0 to 2.13.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:35 +00:00
dependabot[bot] 9d9ab46b68
Bump maven-war-plugin from 3.3.2 to 3.4.0
Bumps [maven-war-plugin](https://github.com/apache/maven-war-plugin) from 3.3.2 to 3.4.0.
- [Commits](https://github.com/apache/maven-war-plugin/compare/maven-war-plugin-3.3.2...maven-war-plugin-3.4.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-war-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:33 +00:00
dependabot[bot] dcc294df69
Bump asciidoctorj-diagram from 2.2.8 to 2.2.9
Bumps [asciidoctorj-diagram](https://github.com/asciidoctor/asciidoctorj-diagram) from 2.2.8 to 2.2.9.
- [Release notes](https://github.com/asciidoctor/asciidoctorj-diagram/releases)
- [Commits](https://github.com/asciidoctor/asciidoctorj-diagram/compare/v2.2.8...v2.2.9)

---
updated-dependencies:
- dependency-name: org.asciidoctor:asciidoctorj-diagram
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:29 +00:00
dependabot[bot] b607e4029f
Bump maven-shade-plugin from 3.4.1 to 3.5.0
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.4.1...maven-shade-plugin-3.5.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:27 +00:00
dependabot[bot] ccc1019e4f
Bump logback-core from 1.3.7 to 1.3.8
Bumps [logback-core](https://github.com/qos-ch/logback) from 1.3.7 to 1.3.8.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.7...v_1.3.8)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:27 +00:00
dependabot[bot] 826eac4c19
Bump mina-core from 2.2.1 to 2.2.2
Bumps [mina-core](https://github.com/apache/mina) from 2.2.1 to 2.2.2.
- [Commits](https://github.com/apache/mina/compare/2.2.1...2.2.2)

---
updated-dependencies:
- dependency-name: org.apache.mina:mina-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:25 +00:00
dependabot[bot] f4a1dedbc2
Bump maven-clean-plugin from 3.2.0 to 3.3.1
Bumps [maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.2.0 to 3.3.1.
- [Release notes](https://github.com/apache/maven-clean-plugin/releases)
- [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.2.0...maven-clean-plugin-3.3.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-clean-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:24 +00:00
dependabot[bot] 40dba5392f
Bump wildfly-elytron from 2.2.0.Final to 2.2.1.Final
Bumps [wildfly-elytron](https://github.com/wildfly-security/wildfly-elytron) from 2.2.0.Final to 2.2.1.Final.
- [Commits](https://github.com/wildfly-security/wildfly-elytron/compare/2.2.0.Final...2.2.1.Final)

---
updated-dependencies:
- dependency-name: org.wildfly.security:wildfly-elytron
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:20 +00:00
dependabot[bot] 0ea20df93c
Bump commons-codec from 1.15 to 1.16.0
Bumps [commons-codec](https://github.com/apache/commons-codec) from 1.15 to 1.16.0.
- [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-codec/compare/rel/commons-codec-1.15...rel/commons-codec-1.16.0)

---
updated-dependencies:
- dependency-name: commons-codec:commons-codec
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:20 +00:00
dependabot[bot] de29c9cd5a
Bump maven-invoker-plugin from 3.5.1 to 3.6.0
Bumps [maven-invoker-plugin](https://github.com/apache/maven-invoker-plugin) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/apache/maven-invoker-plugin/releases)
- [Commits](https://github.com/apache/maven-invoker-plugin/compare/maven-invoker-plugin-3.5.1...maven-invoker-plugin-3.6.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-invoker-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-06 07:51:12 +00:00
dependabot[bot] 417f1f557a
Bump maven.surefire.plugin.version from 3.1.0 to 3.1.2
Bumps `maven.surefire.plugin.version` from 3.1.0 to 3.1.2.

Updates `maven-failsafe-plugin` from 3.1.0 to 3.1.2
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.0...surefire-3.1.2)

Updates `maven-surefire-plugin` from 3.1.0 to 3.1.2
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.0...surefire-3.1.2)

Updates `surefire-junit47` from 3.1.0 to 3.1.2

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.surefire:surefire-junit47
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-05 22:06:32 +00:00
Jan Bartel 2f3f0745d7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-07-05 23:50:39 +02:00
dependabot[bot] f513fca922
Bump maven-release-plugin from 3.0.0 to 3.0.1
Bumps [maven-release-plugin](https://github.com/apache/maven-release) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/apache/maven-release/releases)
- [Commits](https://github.com/apache/maven-release/compare/maven-release-3.0.0...maven-release-3.0.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-05 21:36:27 +00:00
dependabot[bot] ccd04dccce
Bump logback-core from 1.4.7 to 1.4.8
Bumps [logback-core](https://github.com/qos-ch/logback) from 1.4.7 to 1.4.8.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.7...v_1.4.8)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-01 00:19:28 +00:00
dependabot[bot] 38244044f7
Bump maven.resolver.version from 1.9.10 to 1.9.13
Bumps `maven.resolver.version` from 1.9.10 to 1.9.13.

Updates `maven-resolver-api` from 1.9.10 to 1.9.13
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.10...maven-resolver-1.9.13)

Updates `maven-resolver-util` from 1.9.10 to 1.9.13
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.10...maven-resolver-1.9.13)

Updates `maven-resolver-spi` from 1.9.10 to 1.9.13
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.10...maven-resolver-1.9.13)

Updates `maven-resolver-impl` from 1.9.10 to 1.9.13
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.10...maven-resolver-1.9.13)

Updates `maven-resolver-connector-basic` from 1.9.10 to 1.9.13
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.10...maven-resolver-1.9.13)

Updates `maven-resolver-transport-file` from 1.9.10 to 1.9.13
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.10...maven-resolver-1.9.13)

Updates `maven-resolver-transport-http` from 1.9.10 to 1.9.13
- [Release notes](https://github.com/apache/maven-resolver/releases)
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.9.10...maven-resolver-1.9.13)

---
updated-dependencies:
- dependency-name: org.apache.maven.resolver:maven-resolver-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-spi
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-impl
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-connector-basic
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-transport-file
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-transport-http
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-01 00:08:04 +00:00
Jan Bartel 0a4232e261 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-06-29 14:45:46 +02:00
Jan Bartel c8100b18b8
Update to bundle-plugin-5.1.9 (#9954) 2023-06-29 14:41:04 +02:00
Jan Bartel 7b80b0bbcb
Update plexus-utils to 4.0.0 (#9958)
* Update plexus-utils to 4.0.0

---------

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2023-06-29 12:56:36 +02:00
Jan Bartel 801543c4cd Merge remote-tracking branch 'origin/jetty-10.0.x-update-plexus-utils-4.0.0' into jetty-11.0.x 2023-06-29 12:25:44 +02:00
Jan Bartel 151d487fb9 Update plexus-utils to 4.0.0 2023-06-23 16:06:58 +02:00
Ludovic Orban fc36c903c0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-06-05 17:23:43 +02:00
Joakim Erdfelt 606b66bda5
Merge pull request #9824 from eclipse/dependabot/maven/jetty-11.0.x/maven.surefire.plugin.version-3.1.0
Bump maven.surefire.plugin.version from 3.0.0 to 3.1.0
2023-06-02 10:33:21 -05:00
Joakim Erdfelt d625d6fb93
Merge pull request #9841 from eclipse/dependabot/maven/jetty-11.0.x/org.wildfly.security-wildfly-elytron-2.2.0.Final
Bump wildfly-elytron from 2.1.0.Final to 2.2.0.Final
2023-06-02 10:33:13 -05:00
Joakim Erdfelt fd5d718c8d
Merge pull request #9846 from eclipse/dependabot/maven/jetty-11.0.x/org.apache.maven.plugins-maven-assembly-plugin-3.6.0
Bump maven-assembly-plugin from 3.5.0 to 3.6.0
2023-06-02 10:33:07 -05:00
Joakim Erdfelt 209294daec
Merge pull request #9807 from eclipse/dependabot/maven/jetty-10.0.x/maven.surefire.plugin.version-3.1.0
Bump maven.surefire.plugin.version from 3.0.0 to 3.1.0
2023-06-02 10:32:16 -05:00
Joakim Erdfelt 0932b6e0b5
Merge pull request #9835 from eclipse/dependabot/maven/jetty-10.0.x/org.wildfly.security-wildfly-elytron-2.2.0.Final
Bump wildfly-elytron from 2.1.0.Final to 2.2.0.Final
2023-06-02 10:32:07 -05:00
Joakim Erdfelt a1d4007295
Merge pull request #9845 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-gpg-plugin-3.1.0
Bump maven-gpg-plugin from 3.0.1 to 3.1.0
2023-06-02 09:17:53 -05:00
Joakim Erdfelt 0ecf2630c5
Merge pull request #9838 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-plugin-plugin-3.9.0
Bump maven-plugin-plugin from 3.8.2 to 3.9.0
2023-06-02 09:17:43 -05:00
Joakim Erdfelt 81ada03e73
Merge pull request #9833 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-assembly-plugin-3.6.0
Bump maven-assembly-plugin from 3.5.0 to 3.6.0
2023-06-02 09:17:33 -05:00
dependabot[bot] 5885312f73
Bump maven-plugin-plugin from 3.8.2 to 3.9.0
Bumps [maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.8.2...maven-plugin-tools-3.9.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-02 13:56:15 +00:00
dependabot[bot] 480ab27a4a
Bump maven.surefire.plugin.version from 3.0.0 to 3.1.0
Bumps `maven.surefire.plugin.version` from 3.0.0 to 3.1.0.

Updates `maven-failsafe-plugin` from 3.0.0 to 3.1.0
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.0)

Updates `maven-surefire-plugin` from 3.0.0 to 3.1.0
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.0)

Updates `surefire-junit47` from 3.0.0 to 3.1.0

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.surefire:surefire-junit47
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-02 13:19:49 +00:00
dependabot[bot] 4cdbdcf0e4
Bump maven.surefire.plugin.version from 3.0.0 to 3.1.0
Bumps `maven.surefire.plugin.version` from 3.0.0 to 3.1.0.

Updates `maven-failsafe-plugin` from 3.0.0 to 3.1.0
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.0)

Updates `maven-surefire-plugin` from 3.0.0 to 3.1.0
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.0)

Updates `surefire-junit47` from 3.0.0 to 3.1.0

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven.surefire:surefire-junit47
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-02 13:07:37 +00:00
dependabot[bot] ee3c32d15e
Bump wildfly-elytron from 2.1.0.Final to 2.2.0.Final
Bumps [wildfly-elytron](https://github.com/wildfly-security/wildfly-elytron) from 2.1.0.Final to 2.2.0.Final.
- [Commits](https://github.com/wildfly-security/wildfly-elytron/compare/2.1.0.Final...2.2.0.Final)

---
updated-dependencies:
- dependency-name: org.wildfly.security:wildfly-elytron
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-02 13:00:35 +00:00
Olivier Lamy a8415e02bb fix merge
Signed-off-by: Olivier Lamy <olamy@pop-os.localdomain>
2023-06-02 22:29:07 +10:00