Merge pull request #1296 from Dominante/gitignore-fix

Fix bug #1293
This commit is contained in:
Roeland Jago Douma 2016-09-07 16:27:46 +02:00 committed by GitHub
commit df01bddd92
1 changed files with 3 additions and 1 deletions

View File

@ -1,7 +1,6 @@
test/ test/
src/ src/
bower.json bower.json
.gitignore
.jshintrc .jshintrc
.travis.yml .travis.yml
CHANGELOG* CHANGELOG*
@ -36,6 +35,7 @@ moment/templates
# jquery # jquery
jquery/** jquery/**
!jquery/.bower.json !jquery/.bower.json
!jquery/dist
!jquery/dist/jquery.* !jquery/dist/jquery.*
!jquery/MIT-LICENSE.txt !jquery/MIT-LICENSE.txt
@ -126,6 +126,7 @@ backbone/backbone-min*
# davclient.js # davclient.js
davclient.js/** davclient.js/**
!davclient.js/lib !davclient.js/lib
!davclient.js/lib/client.js
!davclient.js/LICENSE !davclient.js/LICENSE
# es6-promise # es6-promise
@ -140,4 +141,5 @@ base64/*min.js
# clipboard # clipboard
clipboard/** clipboard/**
!clipboard/dist
!clipboard/dist/clipboard.js !clipboard/dist/clipboard.js