Merge tag 'v2.22.1' into i18n

# Conflicts: # gui/esiFittings.py
2020-06-19 21:51:45 -04:00
parent 7fa638f62b 31cae0e54b
commit 8e83adf7db
3341 changed files with 94537 additions and 76344 deletions
--- a/gui/devTools.py
+++ b/gui/devTools.py
@@ -26,7 +26,7 @@ import wx
 from logbook import Logger

 import eos.db
-from gui.auxFrame import AuxiliaryFrame
+from gui.auxWindow import AuxiliaryFrame
 from gui.builtinShipBrowser.events import FitSelected

 pyfalog = Logger(__name__)