gofnnp 188f93e2b3 Merge branch 'tasty-coffee' of https://git.hlcompany.ru/git/usersite into tasty-coffee ... # Conflicts: # angular/angular.json # angular/src/app/app.component.ts # angular/src/app/interface/data.ts # angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html # angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss # angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts # angular/src/app/presentation-options/default-option/default-option.module.ts # angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html # angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss # angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts # angular/src/app/presentation-options/default-option/pages/login/login.component.html # angular/src/app/presentation-options/default-option/pages/login/login.component.scss # angular/src/app/services/auth.service.ts # angular/src/environments/environment.prod.ts # angular/src/environments/environment.ts # angular/src/manifest.webmanifest # angular/src/styles.scss		2023-09-12 14:42:41 +04:00
angular	Merge branch 'tasty-coffee' of https://git.hlcompany.ru/git/usersite into tasty-coffee	2023-09-12 14:42:41 +04:00
wallet_meta	dev #15189	2023-09-12 14:36:51 +04:00
.gitignore	dev #12797	2022-10-11 10:40:59 +04:00
Jenkinsfile	fix jenkinsfile	2023-06-15 15:07:28 +04:00