projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 51302a6)
Merge branch 'fragments-ui' of
authorLennart Rosam <lennart@familie-rosam.de>
Sun, 15 Apr 2012 10:41:36 +0000 (12:41 +0200)
committerLennart Rosam <lennart@familie-rosam.de>
Sun, 15 Apr 2012 10:41:36 +0000 (12:41 +0200)
ssh://git@gitorious.org/owncloud/android.git into fragments-ui

Conflicts:
src/eu/alefzero/owncloud/datamodel/OCFile.java


No differences found
ownCloud Android App