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

This commit is contained in:
ccd0 2015-04-05 02:07:37 -07:00
commit 071c6b468c

View File

@ -59,8 +59,8 @@
"http": true,
"https": true,
"software": "foolfuuka",
"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"]
"boards": ["asp", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "y"],
"files": ["asp", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "y"]
}, {
"uid": 22,
"name": "not4plebs",