merge resolved
Showing
- .gitignore 24 additions, 1 deletion.gitignore
- ChatService/nbproject/project.properties 1 addition, 1 deletionChatService/nbproject/project.properties
- IdentService/dist/IdentService.war 0 additions, 0 deletionsIdentService/dist/IdentService.war
- IdentService/nbproject/private/private.properties 1 addition, 1 deletionIdentService/nbproject/private/private.properties
- KAA-JSP/build/web/catalog.jsp 14 additions, 6 deletionsKAA-JSP/build/web/catalog.jsp
- KAA-JSP/build/web/css/style.css 58 additions, 0 deletionsKAA-JSP/build/web/css/style.css
- KAA-JSP/web/catalog.jsp 14 additions, 6 deletionsKAA-JSP/web/catalog.jsp
- KAA-JSP/web/css/style.css 58 additions, 0 deletionsKAA-JSP/web/css/style.css
- MarketPlaceService/dist/MarketPlaceService.war 0 additions, 0 deletionsMarketPlaceService/dist/MarketPlaceService.war
- login.java 0 additions, 190 deletionslogin.java
Please register or sign in to comment