Merge remote-tracking branch 'origin/master' into updates

jmg1138 · jmg1138 · commit bb6d2d60631a · 2017-11-09T12:34:32.000-08:00
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-wxPython==4.0.0b1
+wxPython==4.0.0b2
