Merge branch 'development' into PreferencesPaneV2

This commit is contained in:
Ebag333
2017-02-26 11:22:10 -08:00
committed by GitHub
16 changed files with 560 additions and 70 deletions

View File

@@ -52,4 +52,5 @@ from gui.builtinStatsViews import ( # noqa: E402, F401
rechargeViewFull,
targetingMiscViewMinimal,
priceViewFull,
outgoingViewFull,
)