projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: d8d7562)
Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency
authorMMMarcy <steiner.marcello@gmail.com>
Fri, 17 Oct 2014 12:58:27 +0000 (14:58 +0200)
committerMMMarcy <steiner.marcello@gmail.com>
Fri, 17 Oct 2014 12:58:27 +0000 (14:58 +0200)
Conflicts:
owncloud-android-library
pom.xml


No differences found
ownCloud Android App