Merge 0.9.12-incubating changes back to master.

This commit is contained in:
James Muehlner
2017-03-01 08:27:22 -08:00
22 changed files with 36 additions and 67 deletions

View File

@@ -59,7 +59,7 @@ public class ExtensionModule extends ServletModule {
private static final List<String> ALLOWED_GUACAMOLE_VERSIONS =
Collections.unmodifiableList(Arrays.asList(
"*",
"0.9.11-incubating"
"0.9.12-incubating"
));
/**