projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b36914d)
Merge branch 'develop' into file_browsing_refactoring
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 6 May 2013 08:48:43 +0000 (10:48 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 6 May 2013 08:48:43 +0000 (10:48 +0200)
Conflicts:
AndroidManifest.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java


No differences found
ownCloud Android App