Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Matthew Cech committed 2019-04-21 01:29:29 -07:00
commit 05aa2e3b6f
10 files changed
+69 -14

No files matched your search

+1 -3
View File
@@ -36,11 +36,9 @@ public class Plugin
contents = contentBuilder.toString();
globals = JsePlatform.standardGlobals();
globals.load(contents).call();
func_plugin = globals.get("plugin");
String output = null;
}
catch (IOException e)
{