Merge branch 'master' into master

This commit is contained in:
supitsara prathan 2019-10-21 17:26:55 +07:00 committed by GitHub
commit 8c0bf66ac8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View file

@ -160,9 +160,8 @@ docker run -d -p 8000:8000 pokeapi
## Contributing
This project exists thanks to all the people who contribute. [[Contribute]](blob/master/CONTRIBUTING.md).
This project exists thanks to all the people who contribute. [[Contribute]](https://github.com/PokeAPI/pokeapi/blob/master/CONTRIBUTING.md).
<a href="graphs/contributors"><img src="https://opencollective.com/pokeapi/contributors.svg?width=890" /></a>
All contributions are welcome: bug fixes, data contributions, recommendations.
Please see the [issues on GitHub](https://github.com/PokeAPI/pokeapi/issues) before you submit a pull request or raise an issue, someone else might have beat you to it.

2
requirements.txt Executable file → Normal file
View file

@ -1,4 +1,4 @@
Django==2.1.2
Django==2.1.11
Pillow==2.6.1
Unipath==1.1
coverage==4.5.1