Merge branch 'master' into site

This commit is contained in:
David DeSandro
2016-01-06 15:35:58 -05:00

View File

@@ -286,7 +286,7 @@ module.exports = {
module: {
loaders: [
{
test: /imagesloaded/,
test: /imagesloaded|wolfy87-eventemitter/,
loader: 'imports?define=>false&this=>window'
}
]