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-04-08 02:03:53 -07:00
commit 07f2bc0fca
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,8 +59,8 @@
"http": true, "http": true,
"https": true, "https": true,
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["asp", "b", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "y"], "boards": ["asp", "b", "cm", "fit", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "y"],
"files": ["asp", "b", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "y"] "files": ["asp", "b", "cm", "fit", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "y"]
}, { }, {
"uid": 22, "uid": 22,
"name": "not4plebs", "name": "not4plebs",