Merge branch 'v3' of github.com:MayhemYDG/4chan-x into v3

This commit is contained in:
Mayhem 2013-05-19 23:23:55 +02:00
commit 89a7bf5cbc

View File

@ -68,7 +68,7 @@
"http": true, "http": true,
"https": true, "https": true,
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "s", "s4s", "t", "trv", "y"], "boards": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "pol", "s", "s4s", "t", "trv", "y"],
"files": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "s", "s4s", "t", "trv", "y"] "files": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "s", "s4s", "t", "trv", "y"]
}, { }, {
"uid": 7, "uid": 7,
@ -95,8 +95,8 @@
"http": true, "http": true,
"https": false, "https": false,
"software": "fuuka", "software": "fuuka",
"boards": ["an", "fit", "k", "mlp", "r9k", "toy", "x"], "boards": ["an", "fit", "k", "mlp", "r9k", "toy"],
"files": ["an", "k", "toy", "x"] "files": ["an", "fit", "k", "r9k", "toy"]
}, { }, {
"uid": 10, "uid": 10,
"name": "warosu", "name": "warosu",