Merge branch 'share_link_show_shared_files' into bug_in_refresh_of_shared_state_when_...
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 30 Jan 2014 17:33:45 +0000 (18:33 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 30 Jan 2014 17:33:45 +0000 (18:33 +0100)
commitd8eb34aa4934681bffd14346bbe9a36c68099614
tree6ff84bfa7039efb8b7fa1d73d6f5273c5858e950
parentc9b639477ecdf7603731ec2684bf8d9bbc0e0aa7
parenta6589abc5428ba515e464dde23aba6e712f30127
Merge branch 'share_link_show_shared_files' into bug_in_refresh_of_shared_state_when_device_is_rotated
src/com/owncloud/android/ui/activity/FileDisplayActivity.java