diff options
| author | sowgro <tpoke.ferrari@gmail.com> | 2025-03-30 20:36:19 -0400 |
|---|---|---|
| committer | sowgro <tpoke.ferrari@gmail.com> | 2025-03-30 20:36:19 -0400 |
| commit | 2c2957da48b62d16ce24addcc46d0d0ed66f7a9d (patch) | |
| tree | 209e3fa65cd61dfd6785178ae438b919d69f0de7 /ufund-api/.gitignore | |
| parent | 6bfbf7fa3b5b14b04f99f2dd6c33d336f6f081f6 (diff) | |
| parent | b29f29eca643648381bfb62a4b90ad29e17f48a7 (diff) | |
| download | JellySolutions-2c2957da48b62d16ce24addcc46d0d0ed66f7a9d.tar.gz JellySolutions-2c2957da48b62d16ce24addcc46d0d0ed66f7a9d.tar.bz2 JellySolutions-2c2957da48b62d16ce24addcc46d0d0ed66f7a9d.zip | |
Merge branch 'list-and-cupboard-component-refactor' into css
# Conflicts:
# ufund-api/data/cupboard.json
# ufund-ui/src/app/components/cupboard/cupboard.component.css
# ufund-ui/src/app/components/need-list/need-list.component.css
# ufund-ui/src/app/components/need-page/need-page.component.html
Diffstat (limited to '')
| -rw-r--r-- | ufund-api/.gitignore | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ufund-api/.gitignore b/ufund-api/.gitignore index 052bd9d..24d3397 100644 --- a/ufund-api/.gitignore +++ b/ufund-api/.gitignore @@ -32,5 +32,7 @@ build/ .vscode/ ### application specific ### -# /src/main/resources/application.properties -# /data/cupboard.json
\ No newline at end of file +ufund-api/src/main/resources/application.properties +ufund-api/data/cupboard.json +ufund-api/data/users.json +ufund-api/data/userAuths.json
\ No newline at end of file |