# Conflicts:
#	src/pages/Proof/Create_FromApp/index.js

# Conflicts:
#	src/auth/utils.js

# Conflicts:
#	src/routes/LoginRoutes.js

commit 605c115d48
Author: cyril.tsui <[email protected]>
Date:   Fri Nov 10 16:33:40 2023 +0800

    update

commit 4ac2c96127
Merge: d89d1be 3dbd0b3
Author: Jason <[email protected]>
Date:   Fri Nov 10 16:16:27 2023 +0800

    Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

commit d89d1be964
Author: Jason <[email protected]>
Date:   Fri Nov 10 16:16:25 2023 +0800

    update

commit 3dbd0b30dc
Author: cyril.tsui <[email protected]>
Date:   Fri Nov 10 16:15:39 2023 +0800

    update

commit d6fca0218a
Author: cyril.tsui <[email protected]>
Date:   Fri Nov 10 15:42:38 2023 +0800

    update