merge multi select

[pub/Android/ownCloud.git] / .gitmodules

diff --git a/.gitmodules b/.gitmodules
index 119bb29..882f3c2 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,8 @@
 [submodule "owncloud-android-library"]
        path = owncloud-android-library
-       url = git://github.com/owncloudChalmers/android-library.git
+       url = git://github.com/owncloud/android-library.git
+       branch = master
+[submodule "ocdoc"]
+       path = user_manual/ocdoc
+       url = https://github.com/owncloud/documentation
+       branch = master