Merge branch 'pr/n217_Chris-Johnston'

# Conflicts:
#	data.json
pull/218/head^2
Christopher K. Hoadley 5 years ago
commit d584b8ea6c

@ -1216,5 +1216,12 @@
"urlMain": "https://gfycat.com/",
"username_claimed": "Test",
"username_unclaimed": "noonewouldeverusethis7"
},
"Pokemon Showdown": {
"errorType": "status_code",
"url": "https://pokemonshowdown.com/users/{}",
"urlMain": "https://pokemonshowdown.com",
"username_claimed": "blue",
"username_unclaimed": "noonewouldeverusethis7"
}
}

Loading…
Cancel
Save