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

McMackety · Mar 8, 2020 · 73173e2 · 73173e2
2 parents f0dba0e + b7464e6
commit 73173e2
Showing 1 changed file with 0 additions and 27 deletions.
diff --git a/common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java b/common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java