Skip to content
Snippets Groups Projects
  • Sarthak Shrivastava's avatar
    23ea077c
    Merge branch 'org_auth' · 23ea077c
    Sarthak Shrivastava authored
    # Conflicts:
    #	inventory-manager/src/App.jsx
    #	inventory-manager/src/components/myorg/OrganizationDetails.jsx
    #	src/main/java/com/example/accessingdatamysql/item/ItemController.java
    23ea077c
    History
    Merge branch 'org_auth'
    Sarthak Shrivastava authored
    # Conflicts:
    #	inventory-manager/src/App.jsx
    #	inventory-manager/src/components/myorg/OrganizationDetails.jsx
    #	src/main/java/com/example/accessingdatamysql/item/ItemController.java