nEEtdo0d c398d7422e Fix: Resolve merge conflicts with page.py, new page page_guild ...

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

# Conflicts:
#	module/ui/page.py

2021-01-01 10:51:52 -05:00

..

assets.py

Fix: Resolve merge conflicts with page.py, new page page_guild

2021-01-01 10:51:52 -05:00

page.py

Fix: Resolve merge conflicts with page.py, new page page_guild

2021-01-01 10:51:52 -05:00

switch.py

Opt: Switch class

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

ui.py

Add: page_guild

2020-12-29 00:04:35 -05:00