diff options
author | sowgro <tpoke.ferrari@gmail.com> | 2025-03-17 17:17:06 -0400 |
---|---|---|
committer | sowgro <tpoke.ferrari@gmail.com> | 2025-03-17 17:17:06 -0400 |
commit | baf4f2c0189d5c5f8ade40f0ceaed3ab7a7d4754 (patch) | |
tree | e9213224b8f1b35b860f016a6a3d1318def8aae2 /ufund-api/data/users.json | |
parent | bf33fa3ca9f29b1e75cc077ae2eaaf4f5725e4b3 (diff) | |
parent | d737551fba5617843f3014be6994490dd4328183 (diff) | |
download | JellySolutions-baf4f2c0189d5c5f8ade40f0ceaed3ab7a7d4754.tar.gz JellySolutions-baf4f2c0189d5c5f8ade40f0ceaed3ab7a7d4754.tar.bz2 JellySolutions-baf4f2c0189d5c5f8ade40f0ceaed3ab7a7d4754.zip |
Merge remote-tracking branch 'origin/main' into cupboard-component
# Conflicts:
# ufund-api/data/cupboard.json
# ufund-ui/src/app/app.module.ts
Diffstat (limited to '')
-rw-r--r-- | ufund-api/data/users.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ufund-api/data/users.json b/ufund-api/data/users.json index 4e98a14..106f11e 100644 --- a/ufund-api/data/users.json +++ b/ufund-api/data/users.json @@ -1 +1 @@ -[{"name":"steve","password":null}]
\ No newline at end of file +[{"username":"adf","passwordHash":96419,"basket":[]},{"username":"tbone","passwordHash":97526364,"basket":[]},{"username":"sowgro","passwordHash":389416948,"basket":[]},{"username":"phil","passwordHash":-1054080181,"basket":[]}]
\ No newline at end of file |