projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 3a8ff76)
Merge branch 'master' into develop
authorjabarros <jabarros@solidgear.es>
Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)
committerjabarros <jabarros@solidgear.es>
Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)
Conflicts:
owncloud-android-library


No differences found
ownCloud Android App