Merge branch Sharkey:develop into develop
No related branches found
No related tags found
Showing
- .config/ci.yml 8 additions, 3 deletions.config/ci.yml
- .config/docker_example.yml 6 additions, 1 deletion.config/docker_example.yml
- .config/example.yml 6 additions, 1 deletion.config/example.yml
- CONTRIBUTING.md 9 additions, 0 deletionsCONTRIBUTING.md
- chart/files/default.yml 6 additions, 1 deletionchart/files/default.yml
- locales/en-US.yml 2 additions, 2 deletionslocales/en-US.yml
- locales/it-IT.yml 2 additions, 1 deletionlocales/it-IT.yml
- package.json 1 addition, 1 deletionpackage.json
- packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg 0 additions, 0 deletions...ckend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg
- packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf 0 additions, 0 deletions...ckend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf
- packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff 0 additions, 0 deletions...kend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff
- packages/backend/assets/fonts/sharkey-icons/shark-font.svg 0 additions, 0 deletionspackages/backend/assets/fonts/sharkey-icons/shark-font.svg
- packages/backend/assets/fonts/sharkey-icons/shark-font.ttf 0 additions, 0 deletionspackages/backend/assets/fonts/sharkey-icons/shark-font.ttf
- packages/backend/assets/fonts/sharkey-icons/shark-font.woff 0 additions, 0 deletionspackages/backend/assets/fonts/sharkey-icons/shark-font.woff
- packages/backend/assets/fonts/sharkey-icons/style.css 100 additions, 17 deletionspackages/backend/assets/fonts/sharkey-icons/style.css
- packages/backend/scripts/check_connect.js 27 additions, 5 deletionspackages/backend/scripts/check_connect.js
- packages/backend/src/boot/master.ts 9 additions, 1 deletionpackages/backend/src/boot/master.ts
- packages/backend/src/config.ts 20 additions, 8 deletionspackages/backend/src/config.ts
- packages/backend/src/core/AvatarDecorationService.ts 1 addition, 1 deletionpackages/backend/src/core/AvatarDecorationService.ts
- packages/backend/src/core/CacheService.ts 6 additions, 6 deletionspackages/backend/src/core/CacheService.ts
Loading