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

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

Browse Source 
Conflicts:
	src/Archive/archives.json
This commit is contained in:
ccd0 2014-12-11 23:15:45 -08:00
commit 0a25ca06d8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Archive/archives.json
View File

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