Skip to content

Commit

Permalink
Merge branch 'main' into update-config-names
Browse files Browse the repository at this point in the history
# Conflicts:
#	.env.example
  • Loading branch information
brodoin committed May 1, 2023
2 parents dcaabba + 9021cf0 commit 3c34df4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLIMATE_TOKEN_DRIVER_HOST=http://localhost
CLIMATE_TOKEN_DRIVER_PORT=31314
CADT_API_SERVER_HOST=https://api.climatewarehouse.chia.net
CADT_UI_HOST=https://app.climatewarehouse.chia.net
CADT_API_SERVER_HOST=https://observer.climateactiondata.org/api
CADT_UI_HOST=https://observer.climateactiondata.org
CADT_API_KEY=
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,5 @@
]
}
},
"version": "1.0.12"
"version": "1.0.13"
}
2 changes: 1 addition & 1 deletion src/hooks/useGetAllCWAssets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export function useGetAllCWAssets() {
})
}
return []
}, [assets, organizations])
}, [assets, organizations, projects])

return { isLoading, data, error }
}
Expand Down

0 comments on commit 3c34df4

Please sign in to comment.