Skip to content

Commit

Permalink
Merge branch 'master' of github.com:dojo/dojox
Browse files Browse the repository at this point in the history
  • Loading branch information
kriszyp committed Feb 21, 2014
2 parents 5445774 + 91916e7 commit 81395e1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion dojox.profile.js
Expand Up @@ -58,7 +58,7 @@ var profile = (function(){
}, },


miniExclude: function(filename, mid){ miniExclude: function(filename, mid){
return 0; return /\/demos\//.test(mid);
} }
} }
}; };
Expand Down

2 comments on commit 81395e1

@csnover
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, don’t push merge commits. If you need help learning how to not make merge commits let me know. Thanks!

@kriszyp
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know where this came from, so yes, I guess I need help with something.

Please sign in to comment.