Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency

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

diff --git a/.gitmodules b/.gitmodules
index 119bb29..1756096 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,5 @@
+
 [submodule "owncloud-android-library"]
        path = owncloud-android-library
        url = git://github.com/owncloudChalmers/android-library.git
+       branch = buildsystem/gradle_develop