LmeSzinc 38f55a3a26 Merge branch 'master' into app ...

# Conflicts:
#	module/config/config.py
#	module/reward/reward.py

2021-09-30 21:26:25 +08:00

..

assets.py

Merge branch 'master' into app

2021-09-30 21:26:25 +08:00

navbar.py

Fix: Conflicts among branches

2021-07-24 17:53:45 +08:00

page.py

Opt: Faster switch between page_event and page_campaign

2021-09-26 17:11:22 +08:00

scroll.py

Move commission to a new module, also faster

2021-09-14 14:56:28 +08:00

switch.py

Opt: Switch class

2020-10-20 15:44:32 +08:00

ui.py

Opt: Remove ensure main after task finishes

2021-09-20 17:30:29 +08:00