Merge 0.9.14 changes back to master.

This commit is contained in:
Nick Couchman committed 2018-01-01 16:29:38 -05:00
commit d73a0ece29
31 files changed
+54 -53

No files matched your search

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