Merge remote-tracking branch 'origin/open734' into open-master

This commit is contained in:
bwyu
2015-02-04 12:24:23 -08:00
3 changed files with 3 additions and 1 deletions

View File

@ -103,7 +103,7 @@
{
"key": "items",
"name": "Items",
"glyph": "i",
"glyph": "9",
"description": "Grid of available items.",
"templateUrl": "templates/items/items.html",
"uses": [ "composition" ],