aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-24 09:01:23 +0100
committerLukas Reschke <lukas@owncloud.com>2014-11-24 09:01:23 +0100
commitc556382160a2e571113faaa173548cc75d3397b4 (patch)
treebe6a7a6c4aca4d4ba01ecc4061c6a468c938e6d2
parent0edcfc1dc119a401cd88f5909e0952b31418b00f (diff)
parent03a975a080722d600a15f594a55630d2f0e51bb5 (diff)
downloadnextcloud-server-c556382160a2e571113faaa173548cc75d3397b4.tar.gz
nextcloud-server-c556382160a2e571113faaa173548cc75d3397b4.zip
Merge pull request #12374 from owncloud/vagrant_puphpet_gitignore
add puphpet and vagrant to gitignore
-rw-r--r--.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c0d44301d57..93bacf9b07e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,6 +92,12 @@ nbproject
/build/jsdocs/
/npm-debug.log
+# puphpet
+puphpet
+
+# vagrant
+.vagrant
+Vagrantfile
# Tests - auto-generated files
/data-autotest