Skip to content
  • duclong's avatar
    Merge remote-tracking branch 'origin/quang' into trunk · 1e174e97
    duclong authored
    # Conflicts:
    #	SimiCart/res/layout/core_information_description_layout.xml
    #	SimiCart/res/layout/core_profile_layout.xml
    #	SimiCart/res/layout/core_sign_in_layout.xml
    #	SimiCart/res/layout/rtl_core_register_customer.xml
    #	SimiCart/res/layout/rtl_core_sign_in_layout.xml
    1e174e97
Loading