Zuosizhu 5dd82fb419 Merge branch 'master_lme' into merged_origin_feature ...

# Conflicts:
#	campaign/Readme.md
#	module/campaign/campaign_status.py
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json

2023-09-15 08:16:37 +08:00

..

argument

Merge branch 'master_lme' into merged_origin_feature

2023-09-15 08:16:37 +08:00

i18n

Merge branch 'master_lme' into merged_origin_feature

2023-09-15 08:16:37 +08:00

redirect_utils

Del: Remove Shanghai reverse proxy

2023-03-10 20:28:10 +08:00

atomicwrites.py

Dep: Remove atomicwrites dependency, copy-paste it into ALAS

2022-07-09 20:55:09 +08:00

code_generator.py

Upd: ALAS framework updates

2023-05-16 09:11:46 +08:00

config_generated.py

Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature

2023-09-11 20:24:49 +08:00

config_manual.py

Merge branch 'master_lme' into merged_origin_feature

2023-09-15 08:16:37 +08:00

config_updater.py

Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature

2023-09-11 20:24:49 +08:00

config.py

Merge branch 'master' into feature

2023-09-10 16:35:45 +08:00

env.py

Add: Disable multi-instances on phone cloud environment

2023-08-28 17:30:46 +08:00

server.py

Add: [CN] channel server 'com.bilibili.blhx.lenovo' (#2642)

2023-05-30 23:44:00 +08:00

utils.py

Merge branch 'LmeSzinc:master' into 20230309

2023-06-14 22:05:37 +08:00

watcher.py

Opt: Watch user config changes while waiting for new tasks (resolve #1176)

2022-06-05 11:51:01 +08:00