Skip to content

Commit 5754222

Browse files
authored
Merge branch 'master' into compose
2 parents a1eb0f8 + c3e602d commit 5754222

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
2020

21-
> Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql) for more info.
21+
> Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql--) for more info.
2222
2323
## Setup   [![pyVersion37](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/download/releases/3.7/)
2424

SECURITY.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
The following versions of PokeAPI are currently being supported with security updates.
6+
7+
| Version | Supported |
8+
| --- | --- |
9+
| `master` | :white_check_mark: |
10+
| any other version/release/tag | :x: |
11+
12+
## Reporting a Vulnerability
13+
14+
If you find a security issue, please act responsibly and do NOT report it in the public issue tracker.
15+
16+
Instead, send an email to the following email addresses: [email protected], [email protected](@Naramsim)
17+
18+
If you don't receive a prompt answer, open a ticket here: https://github.com/PokeAPI/pokeapi/issues/new/choose

data/v2/csv/pokemon_species_flavor_text.csv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63802,8 +63802,8 @@ water, so it will disappear if it starts raining."
6380263802
不知什么时候就会消失。"
6380363803
186,4,9,"If POLIWAG and
6380463804
POLIWHIRL hear its
63805-
echoing cry, they respond by gather­
63806-
ing from far and
63805+
echoing cry, they respond by gather­ing
63806+
from far and
6380763807
wide."
6380863808
186,5,9,"Whenever three or
6380963809
more of these get
@@ -75609,8 +75609,8 @@ Smeargle fanatics will pay big money for them."
7560975609
235,30,12,"会用尾巴前端渗出的体液画下标记。
7561075610
对于有些标记,爱好者会以高价买卖。"
7561175611
236,4,9,"It is always
75612-
bursting with en­
75613-
ergy. To make it­ self stronger, it
75612+
bursting with energy.
75613+
To make it­ self stronger, it
7561475614
keeps on fighting
7561575615
even if it loses."
7561675616
236,5,9,"Even though it is

0 commit comments

Comments
 (0)