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

This commit is contained in:
ccd0 2016-03-01 22:01:32 -08:00
commit d5bbfc37b6

View File

@ -23,8 +23,8 @@
"http": false, "http": false,
"https": true, "https": true,
"software": "fuuka", "software": "fuuka",
"boards": ["cgl", "g", "mu", "qa"], "boards": ["cgl", "g", "mu"],
"files": ["cgl", "g", "mu", "qa"] "files": ["cgl", "g", "mu"]
}, { }, {
"uid": 15, "uid": 15,
"name": "fgts", "name": "fgts",