Merge remote-tracking branch 'upstream/master' into admin
# Conflicts: # pom.xml # spring-petclinic-api-gateway/pom.xml
No related branches found
No related tags found
Showing
- pom.xml 9 additions, 2 deletionspom.xml
- spring-petclinic-api-gateway/.factorypath 159 additions, 0 deletionsspring-petclinic-api-gateway/.factorypath
- spring-petclinic-api-gateway/.gitignore 1 addition, 0 deletionsspring-petclinic-api-gateway/.gitignore
- spring-petclinic-api-gateway/pom.xml 67 additions, 48 deletionsspring-petclinic-api-gateway/pom.xml
- spring-petclinic-api-gateway/src/main/less/header.less 0 additions, 0 deletionsspring-petclinic-api-gateway/src/main/less/header.less
- spring-petclinic-api-gateway/src/main/less/petclinic.less 1 addition, 3 deletionsspring-petclinic-api-gateway/src/main/less/petclinic.less
- spring-petclinic-api-gateway/src/main/less/responsive.less 0 additions, 0 deletionsspring-petclinic-api-gateway/src/main/less/responsive.less
- spring-petclinic-api-gateway/src/main/less/typography.less 0 additions, 0 deletionsspring-petclinic-api-gateway/src/main/less/typography.less
- spring-petclinic-api-gateway/src/main/resources/application.yml 8 additions, 0 deletions...-petclinic-api-gateway/src/main/resources/application.yml
- spring-petclinic-api-gateway/src/main/resources/static/fonts/montserrat-webfont.eot 0 additions, 0 deletions...ay/src/main/resources/static/fonts/montserrat-webfont.eot
- spring-petclinic-api-gateway/src/main/resources/static/fonts/montserrat-webfont.svg 0 additions, 0 deletions...ay/src/main/resources/static/fonts/montserrat-webfont.svg
- spring-petclinic-api-gateway/src/main/resources/static/fonts/montserrat-webfont.ttf 0 additions, 0 deletions...ay/src/main/resources/static/fonts/montserrat-webfont.ttf
- spring-petclinic-api-gateway/src/main/resources/static/fonts/montserrat-webfont.woff 0 additions, 0 deletions...y/src/main/resources/static/fonts/montserrat-webfont.woff
- spring-petclinic-api-gateway/src/main/resources/static/fonts/varela_round-webfont.eot 0 additions, 0 deletions.../src/main/resources/static/fonts/varela_round-webfont.eot
- spring-petclinic-api-gateway/src/main/resources/static/fonts/varela_round-webfont.svg 0 additions, 0 deletions.../src/main/resources/static/fonts/varela_round-webfont.svg
- spring-petclinic-api-gateway/src/main/resources/static/fonts/varela_round-webfont.ttf 0 additions, 0 deletions.../src/main/resources/static/fonts/varela_round-webfont.ttf
- spring-petclinic-api-gateway/src/main/resources/static/fonts/varela_round-webfont.woff 0 additions, 0 deletions...src/main/resources/static/fonts/varela_round-webfont.woff
- spring-petclinic-api-gateway/src/main/resources/static/images/favicon.png 0 additions, 0 deletions...-api-gateway/src/main/resources/static/images/favicon.png
- spring-petclinic-api-gateway/src/main/resources/static/images/pets.png 0 additions, 0 deletions...nic-api-gateway/src/main/resources/static/images/pets.png
- spring-petclinic-api-gateway/src/main/resources/static/images/platform-bg.png 0 additions, 0 deletions...-gateway/src/main/resources/static/images/platform-bg.png
Loading
Please register or sign in to comment