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

Merge remote-tracking branch 'archives/master'

Browse Source 
Conflicts:
	src/Archive/archives.json
This commit is contained in:
ccd0 2015-01-23 12:27:12 -08:00
commit d8d976e6fa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Archive/archives.json
View File

@ -32,8 +32,8 @@
"http": false, "http": false,
"https": true, "https": true,
"software": "fuuka", "software": "fuuka",
"boards": ["cgl", "g", "mu", "w"], "boards": ["cgl", "g", "mu", "qa", "w"],
"files": ["cgl", "g", "mu", "w"] "files": ["cgl", "g", "mu", "qa", "w"]
}, { }, {
"uid": 10, "uid": 10,
"name": "warosu", "name": "warosu",
@ -50,8 +50,8 @@
"http": true, "http": true,
"https": true, "https": true,
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["asp", "cm", "h", "hc", "hm", "n", "p", "r", "s", "soc", "y"], "boards": ["asp", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "y"],
"files": ["asp", "cm", "h", "hc", "hm", "n", "p", "r", "s", "soc", "y"] "files": ["asp", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "y"]
}, { }, {
"uid": 21, "uid": 21,
"name": "imcute", "name": "imcute",
@ -59,7 +59,7 @@
"http": true, "http": true,
"https": false, "https": false,
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "toy"], "boards": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "qa", "toy"],
"files": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "toy"], "files": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "qa", "toy"],
"imagehosts": ["http://imcute.yt/"] "imagehosts": ["http://imcute.yt/"]
}] }]