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

Merge remote-tracking branch 'archives/master' into bstable

Browse Source 
Conflicts:
	src/Archive/archives.json
This commit is contained in:
ccd0 2015-03-02 12:52:47 -08:00
commit 2eb6a00665
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Archive/archives.json
View File

@ -71,4 +71,13 @@
"boards": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "qa", "toy"], "boards": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "qa", "toy"],
"files": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "qa", "toy"], "files": ["an", "fit", "gif", "int", "mlp", "out", "r9k", "qa", "toy"],
"imagehosts": ["http://imcute.yt/"] "imagehosts": ["http://imcute.yt/"]
}, {
"uid": 22,
"name": "not4plebs",
"domain": "totally.not4plebs.org",
"http": true,
"https": true,
"software": "foolfuuka",
"boards": ["sp"],
"files": ["sp"]
}] }]