Dev 77dba80fbd Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 ...

# Conflicts:
#	project/assets/configs/core.json
#	project/assets/database/locales/global/ch.json
#	project/assets/database/locales/global/cz.json
#	project/assets/database/locales/global/en.json
#	project/assets/database/locales/global/es-mx.json
#	project/assets/database/locales/global/es.json
#	project/assets/database/locales/global/fr.json
#	project/assets/database/locales/global/ge.json
#	project/assets/database/locales/global/hu.json
#	project/assets/database/locales/global/it.json
#	project/assets/database/locales/global/jp.json
#	project/assets/database/locales/global/kr.json
#	project/assets/database/locales/global/pl.json
#	project/assets/database/locales/global/po.json
#	project/assets/database/locales/global/ru.json
#	project/assets/database/locales/global/sk.json
#	project/assets/database/locales/global/tu.json
#	project/src/controllers/TradeController.ts
#	project/src/generators/LocationGenerator.ts

2023-12-08 22:20:16 +00:00

..

configs

Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0

2023-12-08 22:20:16 +00:00

database

Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0

2023-12-08 22:20:16 +00:00

images

Add fence scav quest image

2023-10-19 18:52:47 +01:00