safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0.9.10-incubating changes back to master.

Browse Source
This commit is contained in:
James Muehlner
2016-12-02 19:40:42 -08:00
parent c194e04894 315b0d00cc
commit c29e6ba464
29 changed files with 3483 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
guacamole/pom.xml
View File

@@ -93,8 +93,9 @@
<version>2.6</version>
<configuration>
<!-- Filter translation strings -->
<webResources>
<!-- Filter translation strings -->
<resource>
<directory>src/main/webapp</directory>
<filtering>true</filtering>
@@ -103,6 +104,13 @@
<include>index.html</include>
</includes>
</resource>
<!-- Include all licenses within META-INF -->
<resource>
<directory>src/licenses</directory>
<targetPath>META-INF</targetPath>
</resource>
</webResources>
<!-- Add files from guacamole-common-js -->
@@ -216,6 +224,7 @@
<excludes>
<exclude>src/main/webapp/app/*/templates/*.html</exclude>
<exclude>**/*.json</exclude>
<exclude>src/licenses/**/*</exclude>
</excludes>
</configuration>