Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'archives/master' into 1.9.11.x

Browse Source 
Conflicts:
	src/Archive/archives.json
This commit is contained in:
ccd0 2014-11-19 21:26:25 -08:00
commit 2f1a94e802
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Archive/archives.json
View File

@ -60,6 +60,6 @@
"https": false, "https": false,
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["an", "fit", "gif", "int", "jp", "mlp", "out", "r9k", "sp", "toy"], "boards": ["an", "fit", "gif", "int", "jp", "mlp", "out", "r9k", "sp", "toy"],
"files": ["an", "gif", "int", "jp", "mlp", "out", "r9k", "sp", "toy"], "files": ["an", "gif", "fit", "int", "jp", "mlp", "out", "r9k", "sp", "toy"],
"imagehosts": ["http://imcute.yt/"] "imagehosts": ["http://imcute.yt/"]
}] }]