Skip to content

Commit 1b693b7

Browse files
committed
Merge remote-tracking branch 'origin/master' into 0.5.4-no-jsdom
* origin/master: don't repeat options in module bump version to 0.5.4 update gitter badge to svg version Conflicts: package.json
2 parents a9798be + 6ef3924 commit 1b693b7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SourceJS component management engine was originally developed in [OK.ru](http://
2727

2828
Have questions? Just reach our community through Gitter Chat:
2929

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

3232
## SourceJS is NOT
3333

core/file-tree/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ var busy = false;
1515

1616
var config = {
1717
includedDirs: coreOpts.common.includedDirs,
18-
excludedDirs: ['node_modules', 'bower_components', '.git', '.idea'],
18+
excludedDirs: [],
1919

2020
// TODO: merge with `excludedDirs` in next major release.
21-
excludedDirsGlobal: ['node_modules', 'bower_components', '.git', '.idea'],
21+
excludedDirsGlobal: [],
2222
cron: false,
2323
cronProd: true,
2424
cronRepeatTime: 60000,

0 commit comments

Comments
 (0)