Skip to content

Conversation

@scissorsneedfoodtoo
Copy link
Contributor

Checklist:

@socket-security
Copy link

New dependencies detected. Learn more about Socket for GitHub ↗︎

Packages Version New capabilities Transitives Size Publisher
node-cache 5.1.2 None +1 72.4 kB erdii
axios 1.4.0 None +0 1.74 MB jasonsaayman

@scissorsneedfoodtoo
Copy link
Contributor Author

Note: fixed merge conflicts in docker-compose.yml and port-map.json. Just needed to fix some overlap between the pokeapi-proxy and pokemon-search-app entries.

@scissorsneedfoodtoo scissorsneedfoodtoo merged commit b478bb2 into freeCodeCamp:main Oct 18, 2023
@scissorsneedfoodtoo scissorsneedfoodtoo deleted the feat/add-pokeapi-proxy branch October 18, 2023 05:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants