merge 0a816bc4ceff914c02972db79589c9a986b4c6c9 from osm repo
authorJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Fri, 1 Apr 2016 16:09:18 +0000 (12:09 -0400)
committerJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Fri, 1 Apr 2016 16:09:18 +0000 (12:09 -0400)
commit295164affcc41286cec7e5b3bbe3a63d3412ae8b
treeaf37067c89996953958330cdde6045ec34235901
parent59178d705894364069e2a2cb1ab6af68af1c1249
merge 0a816bc4ceff914c02972db79589c9a986b4c6c9 from osm repo

Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
modules/ui/composer/webapp/src/libraries/model/IconFactory.js