diff options
| author | sowgro <tpoke.ferrari@gmail.com> | 2025-03-06 13:13:33 -0500 |
|---|---|---|
| committer | sowgro <tpoke.ferrari@gmail.com> | 2025-03-06 13:13:33 -0500 |
| commit | 1719047ab97f7773b8b847a10482a8c91b53741d (patch) | |
| tree | 7deeee39a90935ccb6ce6fa4877353c089623c64 /ufund-api/src | |
| parent | d2539df788d97e23dedd06cf42eca92c4aa08112 (diff) | |
| parent | 2bbb2af383b8612f5fde9ce49ac9b61c59ba144a (diff) | |
| download | JellySolutions-1719047ab97f7773b8b847a10482a8c91b53741d.tar.gz JellySolutions-1719047ab97f7773b8b847a10482a8c91b53741d.tar.bz2 JellySolutions-1719047ab97f7773b8b847a10482a8c91b53741d.zip | |
Merge branch 'main' into api-auth
# Conflicts:
# ufund-api/src/main/resources/application.properties
Diffstat (limited to 'ufund-api/src')
| -rw-r--r-- | ufund-api/src/main/resources/application.properties | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ufund-api/src/main/resources/application.properties b/ufund-api/src/main/resources/application.properties index fa5d084..a866f98 100644 --- a/ufund-api/src/main/resources/application.properties +++ b/ufund-api/src/main/resources/application.properties @@ -1,8 +1,8 @@ # rename to application.properties server.error.include-message=always -cupboard.file=ufund-api/data/cupboard.json -users.file=ufund-api/data/users.json +cupboard.file=data/cupboard.json +users.file=data/users.json spring.jackson.mapper.auto-detect-getters=false spring.jackson.mapper.auto-detect-setters=false |