summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-06-24 08:27:25 +0200
committerBart Visscher <bartv@thisnet.nl>2013-06-24 08:27:25 +0200
commit377e9a8677afc92bca61fb1bb055901db8457896 (patch)
tree43d98d7d0d00823714cc6b23aa9366dc93a42609 /.gitignore
parent0bff53eb639eb0271e9c20df91a18247f88a3e1f (diff)
parentaaecfa18edf7c690f06d0ce460bd3a7a98269845 (diff)
downloadnextcloud-server-377e9a8677afc92bca61fb1bb055901db8457896.tar.gz
nextcloud-server-377e9a8677afc92bca61fb1bb055901db8457896.zip
Merge branch 'master' into doctrine
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index fe89c74ab38..68977ad0775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ config/mount.php
apps/inc.php
# ignore all apps except core ones
-apps/*
+apps*
!apps/files
!apps/files_encryption
!apps/files_external
@@ -76,4 +76,4 @@ nbproject
data-autotest
/tests/coverage*
/tests/autoconfig*
-/tests/autotest* \ No newline at end of file
+/tests/autotest*