Merge remote-tracking branch 'theBladeee/patch-1' into bstable

This commit is contained in:
ccd0 2015-04-19 21:49:32 -07:00
commit 7e65db28e3

View File

@ -32,8 +32,8 @@
"http": true, "http": true,
"https": true, "https": true,
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["c", "d", "e", "i", "lgbt", "t", "u", "w", "wg"], "boards": ["c", "d", "e", "i", "lgbt", "t", "u"],
"files": ["c", "d", "e", "i", "lgbt", "t", "u", "w", "wg"] "files": ["c", "d", "e", "i", "lgbt", "t", "u"]
}, { }, {
"uid": 8, "uid": 8,
"name": "Rebecca Black Tech", "name": "Rebecca Black Tech",