Merge branch 'develop' into refresh_folder_contents_when_browsed_into
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 22 Oct 2013 06:26:40 +0000 (08:26 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 22 Oct 2013 06:26:40 +0000 (08:26 +0200)
commit9060663f66a4c518bd428d4d68e035b64e24c26c
tree5415a02e9d7f0359284587cb31426915f1a151e9
parentbb455033763c2fb6bdbda5e1220fb1c820f176da
parent194a7360f88e309608b990e52674ca2f884e6d0a
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java