nEEtdo0d 7607d50545 Fix: resolve merge conflicts

2020-11-19 11:19:41 -05:00

..

argparser_en.py

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

2020-11-16 10:24:18 -05:00

argparser_jp.py

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

2020-11-16 10:24:18 -05:00

argparser_tw.py

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

2020-11-16 10:24:18 -05:00

argparser.py

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

2020-11-16 10:24:18 -05:00

config.py

Fix: resolve merge conflicts

2020-11-19 11:19:41 -05:00

dictionary.py

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

2020-11-16 10:24:18 -05:00

server.py

Optimize: Reuse device instance in the same function

2020-06-16 08:55:44 +08:00

update.py

Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev""

2020-08-18 20:48:14 -03:00