Merge 1.5.0 changes back to master.

This commit is contained in:
James Muehlner
2022-10-28 21:30:19 +00:00
124 changed files with 10400 additions and 2227 deletions

View File

@@ -162,12 +162,12 @@
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
</dependency>
<!-- Guacamole depends on an implementation of JAX-WS -->