projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4f6c0b 023ffeb)
Merge branch 'beta' of github.com:owncloud/android into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 19:12:20 +0000 (20:12 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 19:12:20 +0000 (20:12 +0100)
1  2 
AndroidManifest.xml patch | diff1 | diff2 | blob | history
build.gradle patch | diff1 | diff2 | blob | history

diff --cc AndroidManifest.xml
Simple merge
diff --cc build.gradle
Simple merge
ownCloud Android App