Merge branch 'pr/n216_Chris-Johnston'

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

@ -1209,5 +1209,12 @@
"url": "https://bbs.boingboing.net/u/{}", "url": "https://bbs.boingboing.net/u/{}",
"username_claimed": "boingboing", "username_claimed": "boingboing",
"username_unclaimed": "noonewouldeverusethis7" "username_unclaimed": "noonewouldeverusethis7"
},
"gfycat": {
"errorType": "status_code",
"url": "https://gfycat.com/@{}",
"urlMain": "https://gfycat.com/",
"username_claimed": "Test",
"username_unclaimed": "noonewouldeverusethis7"
} }
} }

Loading…
Cancel
Save