Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into 0.5.4-no-jsdom
Browse files Browse the repository at this point in the history
* origin/master:
  don't repeat options in module
  bump version to 0.5.4
  update gitter badge to svg version

Conflicts:
	package.json
  • Loading branch information
robhrt7 committed Aug 15, 2015
2 parents a9798be + 6ef3924 commit 1b693b7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SourceJS component management engine was originally developed in [OK.ru](http://

Have questions? Just reach our community through Gitter Chat:

[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/sourcejs/Source)
[![Gitter chat](https://img.shields.io/badge/gitter-join%20chat-1dce73.svg)](https://gitter.im/sourcejs/Source)

## SourceJS is NOT

Expand Down
4 changes: 2 additions & 2 deletions core/file-tree/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ var busy = false;

var config = {
includedDirs: coreOpts.common.includedDirs,
excludedDirs: ['node_modules', 'bower_components', '.git', '.idea'],
excludedDirs: [],

// TODO: merge with `excludedDirs` in next major release.
excludedDirsGlobal: ['node_modules', 'bower_components', '.git', '.idea'],
excludedDirsGlobal: [],
cron: false,
cronProd: true,
cronRepeatTime: 60000,
Expand Down

0 comments on commit 1b693b7

Please sign in to comment.