aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-09-07 16:27:46 +0200
committerGitHub <noreply@github.com>2016-09-07 16:27:46 +0200
commitdf01bddd924719adaf1d2572b64af6bcd18e1e1e (patch)
tree3d10675f11b62d950a016863e320302cb38fce4f
parent1d04c9e307892c275f9fad64ef0ebe9bc10e0260 (diff)
parenta45a703d494245f70d09778e8563e7e92dc3e39f (diff)
downloadnextcloud-server-df01bddd924719adaf1d2572b64af6bcd18e1e1e.tar.gz
nextcloud-server-df01bddd924719adaf1d2572b64af6bcd18e1e1e.zip
Merge pull request #1296 from Dominante/gitignore-fix
Fix bug #1293
-rw-r--r--core/vendor/.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index 5160c2a7f97..c20abadb44c 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -1,7 +1,6 @@
test/
src/
bower.json
-.gitignore
.jshintrc
.travis.yml
CHANGELOG*
@@ -36,6 +35,7 @@ moment/templates
# jquery
jquery/**
!jquery/.bower.json
+!jquery/dist
!jquery/dist/jquery.*
!jquery/MIT-LICENSE.txt
@@ -126,6 +126,7 @@ backbone/backbone-min*
# davclient.js
davclient.js/**
!davclient.js/lib
+!davclient.js/lib/client.js
!davclient.js/LICENSE
# es6-promise
@@ -140,4 +141,5 @@ base64/*min.js
# clipboard
clipboard/**
+!clipboard/dist
!clipboard/dist/clipboard.js