Eduard Tihomirov 90ec38852f Merge remote-tracking branch 'origin/master' into develop ... # Conflicts: # backend/pom.xml # backend/src/main/java/ru/micord/ervu/controller/ErvuDataController.java # backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java # backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaTokensStore.java # backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java # config/nginx.conf # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml		2025-01-10 13:15:15 +03:00
..
src	Merge remote-tracking branch 'origin/master' into develop	2025-01-10 13:15:15 +03:00
.npmrc	Project first commit	2024-06-11 11:39:10 +03:00
angular.json	Project first commit	2024-06-11 11:39:10 +03:00
home.html	fix home.html	2024-12-18 14:46:53 +03:00
index.html	change title	2024-10-01 13:48:05 +03:00
index.webpack.html	SUPPORT-8830 3.5 partially	2024-12-27 16:26:01 +03:00
package-lock.json	SUPPORT-8653 fixes	2024-11-08 09:37:38 +03:00
package.json	SUPPORT-8653 fixes	2024-11-08 10:01:02 +03:00
pom.xml	set version 1.9.4	2025-01-08 16:32:58 +03:00
preview.html	change title	2024-10-01 13:48:05 +03:00
save.ts.metadata.js	Project first commit	2024-06-11 11:39:10 +03:00
systemjs.config.js	Project first commit	2024-06-11 11:39:10 +03:00
systemjs.preview.config.js	Project first commit	2024-06-11 11:39:10 +03:00
tsconfig.aot.json	Project first commit	2024-06-11 11:39:10 +03:00
tsconfig.json	fix	2024-11-07 16:58:30 +03:00
webpack.aot.config.js	SUPPORT-8653 fixes	2024-11-08 09:37:38 +03:00