projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 56f1df0)
Merge branch 'feature_previews' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 12 Apr 2013 10:46:18 +0000 (12:46 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 12 Apr 2013 10:46:18 +0000 (12:46 +0200)
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java


No differences found
ownCloud Android App