Merge 1.5.0 changes back to master.
This commit is contained in:
commit
88d9f40a3d
124 files changed
+10400
-2227
No files matched your search
@@ -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 -->
|
||||
|
||||
Reference in new issue
Block a user