fix more rebase issues
Showing
- cas/cas-server/src/main/config/sass/_font-styles.scss 112 additions, 0 deletionscas/cas-server/src/main/config/sass/_font-styles.scss
- cas/cas-server/src/main/resources/static/css/cas.css 112 additions, 0 deletionscas/cas-server/src/main/resources/static/css/cas.css
- ui/ui-frontend-common/src/sass/fonts/font-styles.css 112 additions, 0 deletionsui/ui-frontend-common/src/sass/fonts/font-styles.css
- ui/ui-frontend/package-lock.json 1 addition, 1 deletionui/ui-frontend/package-lock.json
- ui/ui-frontend/projects/demo/src/index.html 0 additions, 8 deletionsui/ui-frontend/projects/demo/src/index.html
- ui/ui-frontend/projects/identity/src/index.html 0 additions, 10 deletionsui/ui-frontend/projects/identity/src/index.html
- ui/ui-frontend/projects/portal/src/index.html 3 additions, 12 deletionsui/ui-frontend/projects/portal/src/index.html
- ui/ui-frontend/projects/starter-kit/src/index.html 3 additions, 8 deletionsui/ui-frontend/projects/starter-kit/src/index.html
Please register or sign in to comment