LmeSzinc 4f4f296e44 Merge branch 'master' into dev ... # Conflicts: # module/os/assets.py		2021-04-16 17:51:18 +08:00
..
ash.py	Fix: Page transition after OS auto search update	2021-04-13 17:50:48 +08:00
assets.py	Fix: [JP] assets fix after font changed	2021-04-16 02:47:31 +09:00