projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10a12fb 9764f93)
Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text...
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Tue, 25 Nov 2014 20:51:26 +0000 (21:51 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Tue, 25 Nov 2014 20:51:26 +0000 (21:51 +0100)
Conflicts:
.idea/misc.xml
.idea/modules.xml
android.iml


Trivial merge
ownCloud Android App