projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 90428ec)
Merge remote-tracking branch 'origin/develop' into folderSizeInfo
authormasensio <masensio@solidgear.es>
Mon, 17 Jun 2013 11:32:40 +0000 (13:32 +0200)
committermasensio <masensio@solidgear.es>
Mon, 17 Jun 2013 11:32:40 +0000 (13:32 +0200)
Conflicts:
.classpath
tests/.classpath


No differences found
ownCloud Android App