Merge remote-tracking branch 'upstream/develop' into develop
[pub/Android/ownCloud.git] / .gitmodules
1
2 [submodule "owncloud-android-library"]
3 path = owncloud-android-library
4 url = git://github.com/owncloud/android-library.git
5 branch = master
6 [submodule "ocdoc"]
7 path = user_manual/ocdoc
8 url = https://github.com/owncloud/documentation
9 branch = master