summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2013-03-16 06:31:16 -0700
committerJan-Christoph Borchardt <hey@jancborchardt.net>2013-03-16 06:31:16 -0700
commit25175937a9a810ad0aadab473f936d27e914abab (patch)
tree132797db6a138951074c073d286af587cbdc413a
parent047ceaac0f33c5b0e1dec05f303e26f040d722e7 (diff)
parent7f43d6559fa3658c6c8eacf4a513d8f8712f5a02 (diff)
downloadnextcloud-server-25175937a9a810ad0aadab473f936d27e914abab.tar.gz
nextcloud-server-25175937a9a810ad0aadab473f936d27e914abab.zip
Merge pull request #2322 from PHLAK/master
Added 3rdparty folder as a git submodule
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
m---------3rdparty0
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 40d6e6ca0fe..b0cc783123c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ owncloud
config/config.php
config/mount.php
apps/inc.php
-3rdparty
# ignore all apps except core ones
apps/*
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..b9c1a3702cf
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "3rdparty"]
+ path = 3rdparty
+ url = git://github.com/owncloud/3rdparty.git
diff --git a/3rdparty b/3rdparty
new file mode 160000
+Subproject 63cb2847921d668c2b48b572872cfddbcf41bea