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-03-21 12:05:23 -07:00
commit aceb5b7a33
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Archive/archives.json
View File

@ -61,16 +61,6 @@
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["asp", "cm", "h", "hc", "hm", "n", "p", "qa", "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", "qa", "r", "s", "soc", "y"] "files": ["asp", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "y"]
}, {
"uid": 21,
"name": "imcute",
"domain": "imcute.yt",
"http": true,
"https": false,
"software": "foolfuuka",
"boards": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "qa", "toy"],
"files": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "qa", "toy"],
"imagehosts": ["http://imcute.yt/"]
}, { }, {
"uid": 22, "uid": 22,
"name": "not4plebs", "name": "not4plebs",
@ -80,4 +70,13 @@
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["sp"], "boards": ["sp"],
"files": ["sp"] "files": ["sp"]
}, {
"uid": 23,
"name": "DesuStorage",
"domain": "archive.desustorage.org",
"http": false,
"https": true,
"software": "foolfuuka",
"boards": ["mlp", "qa"],
"files": ["mlp", "qa"]
}] }]